diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-28 12:50:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-28 12:50:38 +0100 |
| commit | 5ce070c16c728022b43c7e6d68e3068e2b446e33 (patch) | |
| tree | 4129cadb5c8feb846820cde5f20e365b5175643b /libavcodec/h261enc.c | |
| parent | 21ff626ce0a6f3adf4b387e622e54a57c8e90fb0 (diff) | |
| parent | a9d8d35e4833fc4dfbf557ce73c84e9ca6224427 (diff) | |
| download | ffmpeg-5ce070c16c728022b43c7e6d68e3068e2b446e33.tar.gz | |
Merge commit 'a9d8d35e4833fc4dfbf557ce73c84e9ca6224427'
* commit 'a9d8d35e4833fc4dfbf557ce73c84e9ca6224427':
dashenc: Add options to make segment names configurable
Conflicts:
libavformat/dashenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h261enc.c')
0 files changed, 0 insertions, 0 deletions