summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorKostya Shishkov <kostya.shishkov@gmail.com>2007-02-09 12:10:15 +0000
committerKostya Shishkov <kostya.shishkov@gmail.com>2007-02-09 12:10:15 +0000
commit7bb5c2a6ea33f4451b942201bafb8b19b60298cf (patch)
tree9188ccd3008d47489bb79810ea6fc2371b53128d /libavformat
parent928e00948acaa3ec41a5cb34d0e5bbff1a9adf54 (diff)
Raw VC-1 demuxer
Originally committed as revision 7896 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/allformats.c1
-rw-r--r--libavformat/allformats.h1
-rw-r--r--libavformat/raw.c12
3 files changed, 14 insertions, 0 deletions
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 2dcecf5b9d..2f0d8601bd 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -144,6 +144,7 @@ void av_register_all(void)
REGISTER_DEMUXER (TIERTEXSEQ, tiertexseq);
REGISTER_DEMUXER (TTA, tta);
REGISTER_DEMUXER (V4L2, v4l2);
+ REGISTER_DEMUXER (VC1, vc1);
REGISTER_DEMUXER (VIDEO_GRAB_DEVICE, video_grab_device);
REGISTER_DEMUXER (VMD, vmd);
REGISTER_MUXDEMUX(VOC, voc);
diff --git a/libavformat/allformats.h b/libavformat/allformats.h
index 9e0e13e8a3..5603a29531 100644
--- a/libavformat/allformats.h
+++ b/libavformat/allformats.h
@@ -154,6 +154,7 @@ extern AVInputFormat swf_demuxer;
extern AVOutputFormat swf_muxer;
extern AVInputFormat tta_demuxer;
extern AVInputFormat v4l2_demuxer;
+extern AVInputFormat vc1_demuxer;
extern AVInputFormat voc_demuxer;
extern AVOutputFormat voc_muxer;
extern AVInputFormat wav_demuxer;
diff --git a/libavformat/raw.c b/libavformat/raw.c
index 56f47ad047..0f60d6a35a 100644
--- a/libavformat/raw.c
+++ b/libavformat/raw.c
@@ -716,6 +716,18 @@ AVOutputFormat mjpeg_muxer = {
};
#endif //CONFIG_MUXERS
+AVInputFormat vc1_demuxer = {
+ "vc1",
+ "raw vc1",
+ 0,
+ NULL /* vc1_probe */,
+ video_read_header,
+ raw_read_partial_packet,
+ raw_read_close,
+ .extensions = "vc1",
+ .value = CODEC_ID_VC1,
+};
+
/* pcm formats */
#define PCMINPUTDEF(name, long_name, ext, codec) \