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/crystalhd.c | |
| parent | 3fc26d8073a49c96a0704015ce18f5317d87a739 (diff) | |
| parent | da6506c607eda585ba4b15430cf3c9a2ce09c3a9 (diff) | |
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/crystalhd.c')
| -rw-r--r-- | libavcodec/crystalhd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/crystalhd.c b/libavcodec/crystalhd.c index 94f8c85bb9..12a8f8e02b 100644 --- a/libavcodec/crystalhd.c +++ b/libavcodec/crystalhd.c @@ -915,8 +915,8 @@ static int decode(AVCodecContext *avctx, void *data, int *got_frame, AVPacket *a H264Context *h = priv->parser->priv_data; index = av_parser_parse2(priv->parser, avctx, &pout, &psize, - in_data, len, avctx->pkt->pts, - avctx->pkt->dts, 0); + in_data, len, avctx->internal->pkt->pts, + avctx->internal->pkt->dts, 0); if (index < 0) { av_log(avctx, AV_LOG_WARNING, "CrystalHD: Failed to parse h.264 packet to " @@ -950,7 +950,7 @@ static int decode(AVCodecContext *avctx, void *data, int *got_frame, AVPacket *a * avoiding mangling so we need to build a mapping to values * we know will not be mangled. */ - uint64_t pts = opaque_list_push(priv, avctx->pkt->pts, pic_type); + uint64_t pts = opaque_list_push(priv, avctx->internal->pkt->pts, pic_type); if (!pts) { if (free_data) { av_freep(&in_data); |