diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2010-01-07 06:32:34 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2010-01-07 06:32:34 +0000 |
| commit | 0b60f3bdf52bfbfc6052fa332ef6623336cd6d0b (patch) | |
| tree | fd180acf006c9ede7ae42e8ec429dbe1552c2571 /libavcodec/h263dec.c | |
| parent | d7525cba23654452346c1c16456e53b3bd206ba0 (diff) | |
| download | ffmpeg-streaming-0b60f3bdf52bfbfc6052fa332ef6623336cd6d0b.zip ffmpeg-streaming-0b60f3bdf52bfbfc6052fa332ef6623336cd6d0b.tar.gz | |
2 more if(CONFIG_*_DECODER)
Originally committed as revision 21055 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h263dec.c')
| -rw-r--r-- | libavcodec/h263dec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index e63a210..8940489 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -405,7 +405,7 @@ retry: ret= ff_wmv2_decode_picture_header(s); } else if (CONFIG_MSMPEG4_DECODER && s->msmpeg4_version) { ret = msmpeg4_decode_picture_header(s); - } else if (s->h263_pred) { + } else if (CONFIG_MPEG4_DECODER && s->h263_pred) { if(s->avctx->extradata_size && s->picture_number==0){ GetBitContext gb; @@ -413,7 +413,7 @@ retry: ret = ff_mpeg4_decode_picture_header(s, &gb); } ret = ff_mpeg4_decode_picture_header(s, &s->gb); - } else if (s->codec_id == CODEC_ID_H263I) { + } else if (CONFIG_H263I_DECODER && s->codec_id == CODEC_ID_H263I) { ret = ff_intel_h263_decode_picture_header(s); } else if (CONFIG_FLV_DECODER && s->h263_flv) { ret = ff_flv_decode_picture_header(s); |
