From a3ab7c32496c696113cf0189aa3ab9dc4d41e207 Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Tue, 20 Jul 2010 11:50:57 +0000 Subject: asfdec: Handle asf_jfif_media Originally committed as revision 24351 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/asfdec.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'libavformat/asfdec.c') diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c index 149a49306a..0da4b94ee7 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)) { -- cgit v1.2.3