[FFmpeg-cvslog] Merge commit 'f856d9c2f314c493c672dfb9c876da182525da3d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Nov 23 01:32:35 2014 +0100| [9f0fd17c614f46bd22740b2ab97743707f654e2d] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9f0fd17c614f46bd22740b2ab97743707f654e2d
---