diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-27 14:42:15 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-27 14:42:15 +0400 |
| commit | 12f203a0987935b79870a9502b7e148fa064897c (patch) | |
| tree | f75a50bee3da01c3104857891e97c03ac8e7145e /configure | |
| parent | ef8ab2f953079106bb4d72f9ce0af9c38f919130 (diff) | |
| parent | c24469e812501903a46a06eff9722a82e136e841 (diff) | |
Merge commit 'c24469e812501903a46a06eff9722a82e136e841'
* commit 'c24469e812501903a46a06eff9722a82e136e841':
utils: add workaround for AVHWAccel in ff_get_buffer compat code
configure: Remove a stray msmpeg4v1 encoder declaration
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -1779,7 +1779,6 @@ mpeg2video_encoder_select="aandcttables mpegvideoenc" mpeg4_decoder_select="h263_decoder mpeg4video_parser" mpeg4_encoder_select="h263_encoder" msmpeg4v1_decoder_select="h263_decoder" -msmpeg4v1_encoder_select="h263_encoder" msmpeg4v2_decoder_select="h263_decoder" msmpeg4v2_encoder_select="h263_encoder" msmpeg4v3_decoder_select="h263_decoder" |