diff options
| author | Martin Storsjö <martin@martin.st> | 2010-07-20 11:50:57 +0000 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2010-07-20 11:50:57 +0000 |
| commit | a3ab7c32496c696113cf0189aa3ab9dc4d41e207 (patch) | |
| tree | 04022a924d92652746f77083cbd43c2cda9af42f /libavformat | |
| parent | 7428c8f599ca077fe1eea5925970aa2a70671c5d (diff) | |
| download | ffmpeg-a3ab7c32496c696113cf0189aa3ab9dc4d41e207.tar.gz | |
asfdec: Handle asf_jfif_media
Originally committed as revision 24351 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/asfdec.c | 3 |
1 files changed, 3 insertions, 0 deletions
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)) { |