mux all stream types except audio as one pes packet per avpacket, issue #1374

Originally committed as revision 20292 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index 48df438..a8d5d38 100644 (file)
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -741,8 +741,7 @@ static int mpegts_write_packet(AVFormatContext *s, AVPacket *pkt)
         }
     }
 
-    if (st->codec->codec_type == CODEC_TYPE_SUBTITLE ||
-        st->codec->codec_type == CODEC_TYPE_VIDEO) {
+    if (st->codec->codec_type != CODEC_TYPE_AUDIO) {
         // for video and subtitle, write a single pes packet
         mpegts_write_pes(s, st, buf, size, pts, dts);
         av_free(data);