diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 02:56:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 02:56:33 +0100 |
| commit | 1f27053b91e4f0b1f6571448db9e363fd84e65b6 (patch) | |
| tree | 80a21139597213277feb0fa99a3006d4a1b800dd /libavcodec/options_table.h | |
| parent | d3edc65dd1e5b5d4246fcb8bcd216eb558bab7d4 (diff) | |
| parent | de27d2b92fa97deb2856d18e9f5f19586ce45a0f (diff) | |
| download | ffmpeg-1f27053b91e4f0b1f6571448db9e363fd84e65b6.tar.gz | |
Merge commit 'de27d2b92fa97deb2856d18e9f5f19586ce45a0f'
* commit 'de27d2b92fa97deb2856d18e9f5f19586ce45a0f':
lavc: remove disabled FF_API_LIBMPEG2 cruft
Conflicts:
libavcodec/avcodec.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/options_table.h')
| -rw-r--r-- | libavcodec/options_table.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 3a880c22a8..befa448c40 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -189,7 +189,6 @@ static const AVOption options[]={ {"int", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_INT }, INT_MIN, INT_MAX, V|E|D, "idct"}, {"simple", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLE }, INT_MIN, INT_MAX, V|E|D, "idct"}, {"simplemmx", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEMMX }, INT_MIN, INT_MAX, V|E|D, "idct"}, -{"libmpeg2mmx", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_LIBMPEG2MMX }, INT_MIN, INT_MAX, V|E|D, "idct"}, #if FF_API_MMI {"mmi", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_MMI }, INT_MIN, INT_MAX, V|E|D, "idct"}, #endif |