* commit 'f856d9c2f314c493c672dfb9c876da182525da3d': dashenc: Don't require the stream bitrate to be known Conflicts: libavformat/dashenc.c See: 5f8fcdd448 Merged-by: Michael Niedermayer <michaelni@gmx.at>
5f8fcdd448