diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-23 01:32:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-23 01:34:05 +0100 |
| commit | 9f0fd17c614f46bd22740b2ab97743707f654e2d (patch) | |
| tree | a8b64b4ac774c5f5ab40d66aaae804a8b8651410 /libavformat/cache.c | |
| parent | 6d8dda169384e3935d38da2ed127ba82fd666ee7 (diff) | |
| parent | f856d9c2f314c493c672dfb9c876da182525da3d (diff) | |
| download | ffmpeg-9f0fd17c614f46bd22740b2ab97743707f654e2d.tar.gz | |
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>
Diffstat (limited to 'libavformat/cache.c')
0 files changed, 0 insertions, 0 deletions