From ac7672053a9d185544e7a93deac770e15d57ae93 Mon Sep 17 00:00:00 2001 From: Johns Date: Fri, 30 May 2014 10:18:20 +0200 Subject: Fix out of sync with ffmpeg >= 2.2. This workaround for some special ffmpeg versions, conflicts with latest ffmpeg. --- codec.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'codec.c') diff --git a/codec.c b/codec.c index be6ed29..b6f9fba 100644 --- a/codec.c +++ b/codec.c @@ -222,12 +222,14 @@ static int Codec_get_buffer(AVCodecContext * video_ctx, AVFrame * frame) frame->data[2] = NULL; frame->data[3] = NULL; +#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(52,66,100) // reordered frames if (video_ctx->pkt) { frame->pkt_pts = video_ctx->pkt->pts; } else { frame->pkt_pts = AV_NOPTS_VALUE; } +#endif return 0; } #endif @@ -249,12 +251,14 @@ static int Codec_get_buffer(AVCodecContext * video_ctx, AVFrame * frame) frame->data[0] = (void *)(size_t) surface; frame->data[3] = (void *)(size_t) surface; +#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(52,66,100) // reordered frames if (video_ctx->pkt) { frame->pkt_pts = video_ctx->pkt->pts; } else { frame->pkt_pts = AV_NOPTS_VALUE; } +#endif return 0; } //Debug(3, "codec: fallback to default get_buffer\n"); -- cgit v1.2.3