diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 14:26:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 14:26:17 +0100 |
| commit | c08e523586b6be36bee3f73d609733cd80a57674 (patch) | |
| tree | 5d728f8f5c8647e7ffe3197c25875a1b3dee380d /libavcodec/rawdec.c | |
| parent | 83e89787984d3f96cb793ebfddc6078d6bc50073 (diff) | |
| parent | 4a0f6651434c6f213d830140f575b4ec7858519f (diff) | |
| download | ffmpeg-c08e523586b6be36bee3f73d609733cd80a57674.tar.gz | |
Merge commit '4a0f6651434c6f213d830140f575b4ec7858519f'
* commit '4a0f6651434c6f213d830140f575b4ec7858519f':
libavcodec: when decoding, copy replaygain side data to decoded frames
Conflicts:
libavcodec/internal.h
libavcodec/rawdec.c
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rawdec.c')
| -rw-r--r-- | libavcodec/rawdec.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index 007674ec38..85a69e91a5 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -209,8 +209,11 @@ static int raw_decode(AVCodecContext *avctx, void *data, int *got_frame, frame->pict_type = AV_PICTURE_TYPE_I; frame->key_frame = 1; - frame->reordered_opaque = avctx->reordered_opaque; - frame->pkt_pts = avctx->internal->pkt->pts; + + res = ff_decode_frame_props(avctx, frame); + if (res < 0) + return res; + av_frame_set_pkt_pos (frame, avctx->internal->pkt->pos); av_frame_set_pkt_duration(frame, avctx->internal->pkt->duration); |