Commit 51ce2207 authored by Michael Niedermayer's avatar Michael Niedermayer

Add a few CONFIG_MPEG4_DECODER that should be there.

Originally committed as revision 21082 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent f2e77e4b
...@@ -1481,7 +1481,7 @@ int ff_h263_resync(MpegEncContext *s){ ...@@ -1481,7 +1481,7 @@ int ff_h263_resync(MpegEncContext *s){
if(show_bits(&s->gb, 16)==0){ if(show_bits(&s->gb, 16)==0){
pos= get_bits_count(&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); ret= mpeg4_decode_video_packet_header(s);
else else
ret= h263_decode_gob_header(s); ret= h263_decode_gob_header(s);
...@@ -1498,7 +1498,7 @@ int ff_h263_resync(MpegEncContext *s){ ...@@ -1498,7 +1498,7 @@ int ff_h263_resync(MpegEncContext *s){
GetBitContext bak= s->gb; GetBitContext bak= s->gb;
pos= get_bits_count(&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); ret= mpeg4_decode_video_packet_header(s);
else else
ret= h263_decode_gob_header(s); ret= h263_decode_gob_header(s);
......
...@@ -172,7 +172,7 @@ static int decode_slice(MpegEncContext *s){ ...@@ -172,7 +172,7 @@ static int decode_slice(MpegEncContext *s){
if(s->partitioned_frame){ if(s->partitioned_frame){
const int qscale= s->qscale; 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) if(ff_mpeg4_decode_partitions(s) < 0)
return -1; return -1;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment