From 45f3d4e63e7807ff3d281f269625ed83f11e4cdc Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michael@niedermayer.cc>
Date: Fri, 21 Aug 2015 03:04:41 +0200
Subject: [PATCH] ffmpeg: Use correct codec_id for av_parser_change() check
No testcase known
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
ffmpeg.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/ffmpeg.c b/ffmpeg.c
index c26b5811e61..ead1c71bb5e 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1859,12 +1859,11 @@ static void do_streamcopy(InputStream *ist, OutputStream *ost, const AVPacket *p
opkt.duration = av_rescale_q(pkt->duration, ist->st->time_base, ost->st->time_base);
opkt.flags = pkt->flags;
-
// FIXME remove the following 2 lines they shall be replaced by the bitstream filters
- if ( ost->enc_ctx->codec_id != AV_CODEC_ID_H264
- && ost->enc_ctx->codec_id != AV_CODEC_ID_MPEG1VIDEO
- && ost->enc_ctx->codec_id != AV_CODEC_ID_MPEG2VIDEO
- && ost->enc_ctx->codec_id != AV_CODEC_ID_VC1
+ if ( ost->st->codec->codec_id != AV_CODEC_ID_H264
+ && ost->st->codec->codec_id != AV_CODEC_ID_MPEG1VIDEO
+ && ost->st->codec->codec_id != AV_CODEC_ID_MPEG2VIDEO
+ && ost->st->codec->codec_id != AV_CODEC_ID_VC1
) {
int ret = av_parser_change(ost->parser, ost->st->codec,
&opkt.data, &opkt.size,
--
GitLab