diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 11:41:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 11:41:55 +0100 |
| commit | ab71be091206a2264f3a8862215fc284bb8e6274 (patch) | |
| tree | 1634753965d201a33f583097660958548cce3106 /libavcodec/rawdec.c | |
| parent | 3fc26d8073a49c96a0704015ce18f5317d87a739 (diff) | |
| parent | da6506c607eda585ba4b15430cf3c9a2ce09c3a9 (diff) | |
| download | ffmpeg-ab71be091206a2264f3a8862215fc284bb8e6274.tar.gz | |
Merge commit 'da6506c607eda585ba4b15430cf3c9a2ce09c3a9'
* commit 'da6506c607eda585ba4b15430cf3c9a2ce09c3a9':
lavc: move AVCodecContext.pkt to AVCodecInternal
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, 4 insertions, 3 deletions
diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index dd47f532fd..3f4a8fc86d 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -25,6 +25,7 @@ */ #include "avcodec.h" +#include "internal.h" #include "raw.h" #include "libavutil/avassert.h" #include "libavutil/buffer.h" @@ -182,9 +183,9 @@ 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->pkt->pts; - av_frame_set_pkt_pos (frame, avctx->pkt->pos); - av_frame_set_pkt_duration(frame, avctx->pkt->duration); + frame->pkt_pts = avctx->internal->pkt->pts; + av_frame_set_pkt_pos (frame, avctx->internal->pkt->pos); + av_frame_set_pkt_duration(frame, avctx->internal->pkt->duration); if (context->tff >= 0) { frame->interlaced_frame = 1; |