diff options
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index e6730757b3..618acb74b2 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -4099,7 +4099,7 @@ static int get_consumed_bytes(MpegEncContext *s, int pos, int buf_size) } static int decode_frame(AVCodecContext *avctx, void *data, - int *data_size, AVPacket *avpkt) + int *got_frame, AVPacket *avpkt) { const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; @@ -4136,7 +4136,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, h->delayed_pic[i] = h->delayed_pic[i + 1]; if (out) { - *data_size = sizeof(AVFrame); + *got_frame = 1; *pict = out->f; } @@ -4190,14 +4190,14 @@ not_extra: field_end(h, 0); /* Wait for second field. */ - *data_size = 0; + *got_frame = 0; if (h->next_output_pic && (h->next_output_pic->sync || h->sync>1)) { - *data_size = sizeof(AVFrame); + *got_frame = 1; *pict = h->next_output_pic->f; } } - assert(pict->data[0] || !*data_size); + assert(pict->data[0] || !*got_frame); ff_print_debug_info(s, pict); return get_consumed_bytes(s, buf_index, buf_size); |