diff options
| author | Michael Niedermayer <[email protected]> | 2015-08-21 03:04:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2015-08-21 03:41:45 +0200 |
| commit | e0bd87de8fa35d9a7bd94603fe1a22637143da72 (patch) | |
| tree | c77d4d471caea76bb628a8bfd35a072b6accbd60 | |
| parent | 3faf444010121374637c23109a0582fdb9e536bc (diff) | |
ffmpeg: Use correct codec_id for av_parser_change() check
No testcase known
Signed-off-by: Michael Niedermayer <[email protected]>
(cherry picked from commit 45f3d4e63e7807ff3d281f269625ed83f11e4cdc)
Signed-off-by: Michael Niedermayer <[email protected]>
| -rw-r--r-- | ffmpeg.c | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -1687,12 +1687,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, |