virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Add a few CONFIG_MPEG4_DECODER that should be there.

Browse Source 
Originally committed as revision 21082 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2010-01-08 04:00:06 +00:00
parent f2e77e4b1e
commit 51ce2207c8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/h263.c
View File

@ -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);

2
libavcodec/h263dec.c
View File

@ -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;
}