har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/qpeg: export missing frame properties

Browse Source 
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2020-04-17 00:03:30 -03:00
parent 1b13023860
commit 18bb1d40c1
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/qpeg.c
View File

@ -270,7 +270,7 @@ static int decode_frame(AVCodecContext *avctx,
AVFrame * const p = data; AVFrame * const p = data;
AVFrame * const ref = a->ref; AVFrame * const ref = a->ref;
uint8_t* outdata; uint8_t* outdata;
int delta, ret; int delta, intra, ret;
int pal_size; int pal_size;
const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, &pal_size); const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, &pal_size);
@ -289,7 +289,8 @@ static int decode_frame(AVCodecContext *avctx,
bytestream2_skip(&a->buffer, 1); bytestream2_skip(&a->buffer, 1);
delta = bytestream2_get_byte(&a->buffer); delta = bytestream2_get_byte(&a->buffer);
if(delta == 0x10) { intra = delta == 0x10;
if (intra) {
qpeg_decode_intra(a, outdata, p->linesize[0], avctx->width, avctx->height); qpeg_decode_intra(a, outdata, p->linesize[0], avctx->width, avctx->height);
} else { } else {
qpeg_decode_inter(a, outdata, p->linesize[0], avctx->width, avctx->height, delta, ctable, ref->data[0]); qpeg_decode_inter(a, outdata, p->linesize[0], avctx->width, avctx->height, delta, ctable, ref->data[0]);
@ -308,6 +309,9 @@ static int decode_frame(AVCodecContext *avctx,
if ((ret = av_frame_ref(ref, p)) < 0) if ((ret = av_frame_ref(ref, p)) < 0)
return ret; return ret;
p->key_frame = intra;
p->pict_type = intra ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P;
*got_frame = 1; *got_frame = 1;
return avpkt->size; return avpkt->size;