[SCM] libav/experimental: Use CODEC_ID_PROBE when the mpeg-ps demuxer does not know exactly which video codec is used. Fixes issue49 Departed Trailer.evo (mpeg ps missdetecting h264 as mpeg2video)

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit c1c9046656e976601284bce2f5630c5b958fdb68
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sat Jul 12 22:17:13 2008 +0000

    Use CODEC_ID_PROBE when the mpeg-ps demuxer does not know exactly which
    video codec is used.
    Fixes issue49 Departed Trailer.evo (mpeg ps missdetecting h264 as mpeg2video)
    
    Originally committed as revision 14196 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c
index 7c4f7d9..78fceee 100644
--- a/libavformat/mpeg.c
+++ b/libavformat/mpeg.c
@@ -459,7 +459,7 @@ static int mpegps_read_packet(AVFormatContext *s,
         if(!memcmp(buf, avs_seqh, 4) && (buf[6] != 0 || buf[7] != 1))
             codec_id = CODEC_ID_CAVS;
         else
-            codec_id = CODEC_ID_MPEG2VIDEO;
+            codec_id = CODEC_ID_PROBE;
         type = CODEC_TYPE_VIDEO;
     } else if (startcode >= 0x1c0 && startcode <= 0x1df) {
         type = CODEC_TYPE_AUDIO;

-- 
Libav/FFmpeg packaging