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

Fix Intel I.263 "Strict H.263 compliance" file playback / issue2449

Browse Source
This commit is contained in:
XV 2011-03-24 22:29:31 +01:00 committed by Michael Niedermayer
parent 71af7377bf
commit b14748dd75
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/intelh263dec.c
View File

@ -46,7 +46,7 @@ int ff_intel_h263_decode_picture_header(MpegEncContext *s)
skip_bits1(&s->gb); /* freeze picture release off */ skip_bits1(&s->gb); /* freeze picture release off */
format = get_bits(&s->gb, 3); format = get_bits(&s->gb, 3);
if (format != 7) { if (format == 0 || format == 6) {
av_log(s->avctx, AV_LOG_ERROR, "Intel H263 free format not supported\n"); av_log(s->avctx, AV_LOG_ERROR, "Intel H263 free format not supported\n");
return -1; return -1;
} }
@ -64,7 +64,11 @@ int ff_intel_h263_decode_picture_header(MpegEncContext *s)
s->obmc= get_bits1(&s->gb); s->obmc= get_bits1(&s->gb);
s->pb_frame = get_bits1(&s->gb); s->pb_frame = get_bits1(&s->gb);
if(format == 7){ if (format < 6) {
s->width = h263_format[format][0];
s->height = h263_format[format][1];
}
else {
format = get_bits(&s->gb, 3); format = get_bits(&s->gb, 3);
if(format == 0 || format == 7){ if(format == 0 || format == 7){
av_log(s->avctx, AV_LOG_ERROR, "Wrong Intel H263 format\n"); av_log(s->avctx, AV_LOG_ERROR, "Wrong Intel H263 format\n");