[SCM] libav/experimental: asfdec: Handle asf_jfif_media

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit a3ab7c32496c696113cf0189aa3ab9dc4d41e207
Author: Martin Storsjö <martin at martin.st>
Date:   Tue Jul 20 11:50:57 2010 +0000

    asfdec: Handle asf_jfif_media
    
    Originally committed as revision 24351 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index 149a493..0da4b94 100644
--- a/libavformat/asfdec.c
+++ b/libavformat/asfdec.c
@@ -275,6 +275,9 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap)
                 type = AVMEDIA_TYPE_AUDIO;
             } else if (!guidcmp(&g, &ff_asf_video_stream)) {
                 type = AVMEDIA_TYPE_VIDEO;
+            } else if (!guidcmp(&g, &ff_asf_jfif_media)) {
+                type = AVMEDIA_TYPE_VIDEO;
+                st->codec->codec_id = CODEC_ID_MJPEG;
             } else if (!guidcmp(&g, &ff_asf_command_stream)) {
                 type = AVMEDIA_TYPE_DATA;
             } else if (!guidcmp(&g, &ff_asf_ext_stream_embed_stream_header)) {

-- 
Libav/FFmpeg packaging