diff options
| author | Marton Balint <cus@passwd.hu> | 2015-07-05 19:02:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-06 00:08:48 +0200 |
| commit | 10b6a83fb3ad5311f7b4929cb49696ace234d83a (patch) | |
| tree | 8a50f6ab08cf8b3ba2b57126474e4cc854884cbd /libavcodec/utils.c | |
| parent | 3a19fe0048388442de7d8823e1b458f4865d207f (diff) | |
lavc/utils: change add_metadata_from_side_data to accept avpacket
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index f20cafc552..08fad3ecd5 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -2296,14 +2296,14 @@ fail: return AVERROR_INVALIDDATA; } -static int add_metadata_from_side_data(AVCodecContext *avctx, AVFrame *frame) +static int add_metadata_from_side_data(AVPacket *avpkt, AVFrame *frame) { int size; const uint8_t *side_metadata; AVDictionary **frame_md = avpriv_frame_get_metadatap(frame); - side_metadata = av_packet_get_side_data(avctx->internal->pkt, + side_metadata = av_packet_get_side_data(avpkt, AV_PKT_DATA_STRINGS_METADATA, &size); return av_packet_unpack_dictionary(side_metadata, size, frame_md); } @@ -2406,7 +2406,7 @@ int attribute_align_arg avcodec_decode_video2(AVCodecContext *avctx, AVFrame *pi if (picture->format == AV_PIX_FMT_NONE) picture->format = avctx->pix_fmt; } } - add_metadata_from_side_data(avctx, picture); + add_metadata_from_side_data(avctx->internal->pkt, picture); fail: emms_c(); //needed to avoid an emms_c() call before every return; @@ -2548,7 +2548,7 @@ int attribute_align_arg avcodec_decode_audio4(AVCodecContext *avctx, frame->pkt_dts = avpkt->dts; } if (ret >= 0 && *got_frame_ptr) { - add_metadata_from_side_data(avctx, frame); + add_metadata_from_side_data(avctx->internal->pkt, frame); avctx->frame_number++; av_frame_set_best_effort_timestamp(frame, guess_correct_pts(avctx, |