diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-13 13:32:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-13 13:32:08 +0100 |
| commit | b882079b1265066e5cc7c4415322919bea4c4651 (patch) | |
| tree | 0adc4e80e117edfb50758cad4e6408d8d4f91476 /libavcodec/xfaceenc.c | |
| parent | ccfae038152bf48c98681f5c4a839393313f98db (diff) | |
| parent | e9a6ae775dabef3942632e8d4ef95fff94a1b310 (diff) | |
| download | ffmpeg-b882079b1265066e5cc7c4415322919bea4c4651.tar.gz | |
Merge commit 'e9a6ae775dabef3942632e8d4ef95fff94a1b310'
* commit 'e9a6ae775dabef3942632e8d4ef95fff94a1b310':
dpxenc: mention missing break
Conflicts:
libavcodec/dpxenc.c
No change as the changed code is implemented differently in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/xfaceenc.c')
0 files changed, 0 insertions, 0 deletions