X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fh263dec.c;h=27e1c91cb685ebed68882d1ab92ca2ed4fbb1241;hb=6fb40779cd3457a819e20d6db91a142c47cad3c2;hp=c897bc31c6332ad1499d6fa513296831529c55ef;hpb=42d3fea65f787eed356c47336c240edb7b0c879d;p=ffmpeg diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index c897bc31c63..27e1c91cb68 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -346,7 +346,7 @@ static int decode_slice(MpegEncContext *s){ } int ff_h263_decode_frame(AVCodecContext *avctx, - void *data, int *data_size, + void *data, int *got_frame, AVPacket *avpkt) { const uint8_t *buf = avpkt->data; @@ -368,7 +368,7 @@ uint64_t time= rdtsc(); *pict = s->next_picture_ptr->f; s->next_picture_ptr= NULL; - *data_size = sizeof(AVFrame); + *got_frame = 1; } return 0; @@ -628,7 +628,9 @@ retry: s->current_picture.f.key_frame = s->pict_type == AV_PICTURE_TYPE_I; /* skip B-frames if we don't have reference frames */ - if(s->last_picture_ptr==NULL && (s->pict_type==AV_PICTURE_TYPE_B || s->dropable)) return get_consumed_bytes(s, buf_size); + if (s->last_picture_ptr == NULL && + (s->pict_type == AV_PICTURE_TYPE_B || s->droppable)) + return get_consumed_bytes(s, buf_size); if( (avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type==AV_PICTURE_TYPE_B) || (avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type!=AV_PICTURE_TYPE_I) || avctx->skip_frame >= AVDISCARD_ALL) @@ -753,7 +755,7 @@ intrax8_decoded: } if(s->last_picture_ptr || s->low_delay){ - *data_size = sizeof(AVFrame); + *got_frame = 1; ff_print_debug_info(s, pict); }