RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-08 21:48:20 +00:00
Code Issues Projects Releases Wiki Activity

throw error if unsupported resolution is used with h261

Browse Source 
Originally committed as revision 7097 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2006-11-16 09:58:34 +00:00
parent 09e151848a
commit a57d13b713
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/h261.c
View File

@ -77,7 +77,7 @@ void ff_h261_loop_filter(MpegEncContext *s){
s->dsp.h261_loop_filter(dest_cr, uvlinesize); s->dsp.h261_loop_filter(dest_cr, uvlinesize);
} }
static int ff_h261_get_picture_format(int width, int height){ int ff_h261_get_picture_format(int width, int height){
// QCIF // QCIF
if (width == 176 && height == 144) if (width == 176 && height == 144)
return 0; return 0;

4
libavcodec/mpegvideo.c
View File

@ -1208,6 +1208,10 @@ int MPV_encode_init(AVCodecContext *avctx)
s->low_delay=1; s->low_delay=1;
break; break;
case CODEC_ID_H261: 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);
return -1;
}
s->out_format = FMT_H261; s->out_format = FMT_H261;
avctx->delay=0; avctx->delay=0;
s->low_delay=1; s->low_delay=1;

1
libavcodec/mpegvideo.h
View File

@ -824,6 +824,7 @@ void ff_h261_encode_mb(MpegEncContext *s,
int motion_x, int motion_y); int motion_x, int motion_y);
void ff_h261_encode_picture_header(MpegEncContext * s, int picture_number); void ff_h261_encode_picture_header(MpegEncContext * s, int picture_number);
void ff_h261_encode_init(MpegEncContext *s); void ff_h261_encode_init(MpegEncContext *s);
int ff_h261_get_picture_format(int width, int height);
/* h263.c, h263dec.c */ /* h263.c, h263dec.c */