[SCM] libav/experimental: Alternative solution for the mpegvideo_split + mov problem.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 5bfe91e683739e4d5ba2ce13f4f91441ed698a75
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Wed Feb 3 14:53:14 2010 +0000

    Alternative solution for the mpegvideo_split + mov problem.
    
    Originally committed as revision 21625 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffmpeg.c b/ffmpeg.c
index 720e11a..325ffb1 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 {

-- 
Libav/FFmpeg packaging