Merge commit 'f856d9c2f314c493c672dfb9c876da182525da3d'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Nov 2014 00:32:35 +0000 (01:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Nov 2014 00:34:05 +0000 (01:34 +0100)
commit9f0fd17c614f46bd22740b2ab97743707f654e2d
treea8b64b4ac774c5f5ab40d66aaae804a8b8651410
parent6d8dda169384e3935d38da2ed127ba82fd666ee7
parentf856d9c2f314c493c672dfb9c876da182525da3d
Merge commit 'f856d9c2f314c493c672dfb9c876da182525da3d'

* commit 'f856d9c2f314c493c672dfb9c876da182525da3d':
  dashenc: Don't require the stream bitrate to be known

Conflicts:
libavformat/dashenc.c

See: 5f8fcdd4481b3e740d76b09e10a80e3271ef47b5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/dashenc.c