1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
FFmpeg/libavformat
Michael Niedermayer 9f0fd17c61 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>
2014-11-23 01:34:05 +01:00
..
2014-11-22 13:20:34 +01:00
2014-10-20 10:38:38 +01:00
2014-11-19 11:17:43 +01:00
2014-11-22 22:10:52 +02:00
2014-11-04 14:11:53 +01:00
2014-10-20 10:38:37 +01:00
2014-10-15 20:17:23 +02:00
2014-11-21 17:13:56 +01:00
2014-09-30 20:21:14 +02:00
2014-11-22 14:06:48 +01:00
2014-11-06 09:05:37 +01:00
2014-09-24 23:33:26 +03:00
2014-10-21 03:52:27 +02:00
2014-10-24 09:53:45 +03:00
2014-09-30 20:21:14 +02:00
2014-10-22 23:12:38 +02:00
2014-11-21 17:13:56 +01:00