diff options
author | Tom Harper <d.thomas.harper@gmail.com> | 2006-11-20 14:13:32 +0000 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2006-11-20 14:13:32 +0000 |
commit | 9f83e1427ac17b9c96c3ce3c975929c900c05fee (patch) | |
tree | e74363d410524ba0ccdec33aad8d4f039123d880 /libavcodec | |
parent | ec9ed85dc73a9ead14dce086625996da8858c475 (diff) | |
download | ffmpeg-streaming-9f83e1427ac17b9c96c3ce3c975929c900c05fee.zip ffmpeg-streaming-9f83e1427ac17b9c96c3ce3c975929c900c05fee.tar.gz |
Fix linking with H.261 support disabled.
patch by Tom Harper, d.thomas.harper gmail com
Originally committed as revision 7134 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/mpegvideo.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index ae527d4..6c11be5 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1207,6 +1207,7 @@ int MPV_encode_init(AVCodecContext *avctx) avctx->delay=0; s->low_delay=1; break; +#ifdef CONFIG_H261_ENCODER case CODEC_ID_H261: if (ff_h261_get_picture_format(s->width, s->height) < 0) { av_log(avctx, AV_LOG_ERROR, "The specified picture size of %dx%d is not valid for the H.261 codec.\nValid sizes are 176x144, 352x288\n", s->width, s->height); @@ -1216,6 +1217,7 @@ int MPV_encode_init(AVCodecContext *avctx) avctx->delay=0; s->low_delay=1; break; +#endif case CODEC_ID_H263: if (h263_get_picture_format(s->width, s->height) == 7) { av_log(avctx, AV_LOG_INFO, "The specified picture size of %dx%d is not valid for the H.263 codec.\nValid sizes are 128x96, 176x144, 352x288, 704x576, and 1408x1152. Try H.263+.\n", s->width, s->height); |