diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2004-10-24 13:07:59 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-10-24 13:07:59 +0000 |
| commit | afbb5ce40633eb05d255fdd6b27705f66a58ba95 (patch) | |
| tree | 73df9b778198ec4ab8813a48d5aeb38bad117bd0 /libavformat | |
| parent | db4d9faf8d5269f195e0271067fc0e3cbc0838b5 (diff) | |
dvr-ms video decoding support
Originally committed as revision 3631 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/asf.c | 2 | ||||
| -rw-r--r-- | libavformat/avienc.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/asf.c b/libavformat/asf.c index b804bd7b5a..9f94137dc0 100644 --- a/libavformat/asf.c +++ b/libavformat/asf.c @@ -295,6 +295,8 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap) st->codec.codec_tag = tag1; st->codec.codec_id = codec_get_id(codec_bmp_tags, tag1); + if(tag1 == MKTAG('D', 'V', 'R', ' ')) + st->need_parsing = 1; } pos2 = url_ftell(pb); url_fskip(pb, gsize - (pos2 - pos1 + 24)); diff --git a/libavformat/avienc.c b/libavformat/avienc.c index a9d2c2dc3f..957e665f5f 100644 --- a/libavformat/avienc.c +++ b/libavformat/avienc.c @@ -134,6 +134,7 @@ const CodecTag codec_bmp_tags[] = { { CODEC_ID_MPEG1VIDEO, MKTAG('V', 'C', 'R', '2') }, { CODEC_ID_MPEG1VIDEO, 0x10000001 }, { CODEC_ID_MPEG2VIDEO, 0x10000002 }, + { CODEC_ID_MPEG2VIDEO, MKTAG('D', 'V', 'R', ' ') }, { CODEC_ID_MJPEG, MKTAG('M', 'J', 'P', 'G') }, { CODEC_ID_MJPEG, MKTAG('L', 'J', 'P', 'G') }, { CODEC_ID_LJPEG, MKTAG('L', 'J', 'P', 'G') }, |