summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2010-02-03 14:53:14 +0000
committerMichael Niedermayer <michaelni@gmx.at>2010-02-03 14:53:14 +0000
commit5bfe91e683739e4d5ba2ce13f4f91441ed698a75 (patch)
treeff73b2a0902160cf0b3980ee41c2d3007645a336 /ffmpeg.c
parent451b353d877191d9c27fac707ad811598427409f (diff)
Alternative solution for the mpegvideo_split + mov problem.
Originally committed as revision 21625 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 720e11a1c2..325ffb1d2f 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1507,7 +1507,10 @@ static int output_packet(AVInputStream *ist, int ist_index,
opkt.flags= pkt->flags;
//FIXME remove the following 2 lines they shall be replaced by the bitstream filters
- if(ost->st->codec->codec_id != CODEC_ID_H264) {
+ if( ost->st->codec->codec_id != CODEC_ID_H264
+ && ost->st->codec->codec_id != CODEC_ID_MPEG1VIDEO
+ && ost->st->codec->codec_id != CODEC_ID_MPEG2VIDEO
+ ) {
if(av_parser_change(ist->st->parser, ost->st->codec, &opkt.data, &opkt.size, data_buf, data_size, pkt->flags & PKT_FLAG_KEY))
opkt.destruct= av_destruct_packet;
} else {