diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2010-01-08 04:00:06 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2010-01-08 04:00:06 +0000 |
| commit | 51ce2207c8fd3ee72d74e0a559962beaa895c234 (patch) | |
| tree | a4dd4a4fa3024c7533bb80534ec9faec4766ba0e /libavcodec | |
| parent | f2e77e4b1e9925f8676283c3fc8ccd23e99bb2a8 (diff) | |
| download | ffmpeg-51ce2207c8fd3ee72d74e0a559962beaa895c234.tar.gz | |
Add a few CONFIG_MPEG4_DECODER that should be there.
Originally committed as revision 21082 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h263.c | 4 | ||||
| -rw-r--r-- | libavcodec/h263dec.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/h263.c b/libavcodec/h263.c index e3a3f29b02..fd1c41a399 100644 --- a/libavcodec/h263.c +++ b/libavcodec/h263.c @@ -1481,7 +1481,7 @@ int ff_h263_resync(MpegEncContext *s){ if(show_bits(&s->gb, 16)==0){ pos= get_bits_count(&s->gb); - if(s->codec_id==CODEC_ID_MPEG4) + if(CONFIG_MPEG4_DECODER && s->codec_id==CODEC_ID_MPEG4) ret= mpeg4_decode_video_packet_header(s); else ret= h263_decode_gob_header(s); @@ -1498,7 +1498,7 @@ int ff_h263_resync(MpegEncContext *s){ GetBitContext bak= s->gb; pos= get_bits_count(&s->gb); - if(s->codec_id==CODEC_ID_MPEG4) + if(CONFIG_MPEG4_DECODER && s->codec_id==CODEC_ID_MPEG4) ret= mpeg4_decode_video_packet_header(s); else ret= h263_decode_gob_header(s); diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index d2fcabdb70..f2cb976447 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -172,7 +172,7 @@ static int decode_slice(MpegEncContext *s){ if(s->partitioned_frame){ const int qscale= s->qscale; - if(s->codec_id==CODEC_ID_MPEG4){ + if(CONFIG_MPEG4_DECODER && s->codec_id==CODEC_ID_MPEG4){ if(ff_mpeg4_decode_partitions(s) < 0) return -1; } |