diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 22:18:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 22:18:08 +0100 |
| commit | 5beddbc4cf81fc29866981cdf62de76299627ed0 (patch) | |
| tree | a04caf5439ebe5172b8047d47faaa241c766fe25 /libavcodec/xfaceenc.c | |
| parent | e052f06531c400a845092a7e425ef97834260b3b (diff) | |
| parent | 2a113695238e7675ab75c5fb9a5f59fc92f2ddd9 (diff) | |
| download | ffmpeg-5beddbc4cf81fc29866981cdf62de76299627ed0.tar.gz | |
Merge commit '2a113695238e7675ab75c5fb9a5f59fc92f2ddd9'
* commit '2a113695238e7675ab75c5fb9a5f59fc92f2ddd9':
lavc: remove disabled FF_API_INTER_THRESHOLD cruft
lavc: remove disabled FF_API_COLOR_TABLE_ID cruft
lavc: remove disabled FF_API_MPV_GLOBAL_OPTS cruft
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/xfaceenc.c')
0 files changed, 0 insertions, 0 deletions