mirror of
https://gitee.com/openharmony/third_party_ffmpeg
synced 2024-11-23 19:30:05 +00:00
throw error if unsupported resolution is used with h261
Originally committed as revision 7097 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
09e151848a
commit
a57d13b713
@ -77,7 +77,7 @@ void ff_h261_loop_filter(MpegEncContext *s){
|
||||
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
|
||||
if (width == 176 && height == 144)
|
||||
return 0;
|
||||
|
@ -1208,6 +1208,10 @@ int MPV_encode_init(AVCodecContext *avctx)
|
||||
s->low_delay=1;
|
||||
break;
|
||||
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;
|
||||
avctx->delay=0;
|
||||
s->low_delay=1;
|
||||
|
@ -824,6 +824,7 @@ void ff_h261_encode_mb(MpegEncContext *s,
|
||||
int motion_x, int motion_y);
|
||||
void ff_h261_encode_picture_header(MpegEncContext * s, int picture_number);
|
||||
void ff_h261_encode_init(MpegEncContext *s);
|
||||
int ff_h261_get_picture_format(int width, int height);
|
||||
|
||||
|
||||
/* h263.c, h263dec.c */
|
||||
|
Loading…
Reference in New Issue
Block a user