[FFmpeg-cvslog] mpegts_set_stream_info: remove unneeded codec id check

Michael Niedermayer git at videolan.org
Mon Dec 3 18:03:09 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec  3 17:29:56 2012 +0100| [8897b5aa4c09906e4d43157fdcd7042f47fe15cf] | committer: Michael Niedermayer

mpegts_set_stream_info: remove unneeded codec id check

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8897b5aa4c09906e4d43157fdcd7042f47fe15cf
---

 libavformat/mpegts.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 9e3f342..7380a80 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -614,7 +614,7 @@ static int mpegts_set_stream_info(AVStream *st, PESContext *pes,
     int old_codec_type= st->codec->codec_type;
     int old_codec_id  = st->codec->codec_id;
 
-    if (old_codec_id != AV_CODEC_ID_NONE && avcodec_is_open(st->codec)) {
+    if (avcodec_is_open(st->codec)) {
         av_log(pes->stream, AV_LOG_DEBUG, "cannot set stream info, codec is open\n");
         return 0;
     }



More information about the ffmpeg-cvslog mailing list