Commit 7bb5c2a6 authored by Kostya Shishkov's avatar Kostya Shishkov
Browse files

Raw VC-1 demuxer

Originally committed as revision 7896 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 928e0094
...@@ -144,6 +144,7 @@ void av_register_all(void) ...@@ -144,6 +144,7 @@ void av_register_all(void)
REGISTER_DEMUXER (TIERTEXSEQ, tiertexseq); REGISTER_DEMUXER (TIERTEXSEQ, tiertexseq);
REGISTER_DEMUXER (TTA, tta); REGISTER_DEMUXER (TTA, tta);
REGISTER_DEMUXER (V4L2, v4l2); REGISTER_DEMUXER (V4L2, v4l2);
REGISTER_DEMUXER (VC1, vc1);
REGISTER_DEMUXER (VIDEO_GRAB_DEVICE, video_grab_device); REGISTER_DEMUXER (VIDEO_GRAB_DEVICE, video_grab_device);
REGISTER_DEMUXER (VMD, vmd); REGISTER_DEMUXER (VMD, vmd);
REGISTER_MUXDEMUX(VOC, voc); REGISTER_MUXDEMUX(VOC, voc);
......
...@@ -154,6 +154,7 @@ extern AVInputFormat swf_demuxer; ...@@ -154,6 +154,7 @@ extern AVInputFormat swf_demuxer;
extern AVOutputFormat swf_muxer; extern AVOutputFormat swf_muxer;
extern AVInputFormat tta_demuxer; extern AVInputFormat tta_demuxer;
extern AVInputFormat v4l2_demuxer; extern AVInputFormat v4l2_demuxer;
extern AVInputFormat vc1_demuxer;
extern AVInputFormat voc_demuxer; extern AVInputFormat voc_demuxer;
extern AVOutputFormat voc_muxer; extern AVOutputFormat voc_muxer;
extern AVInputFormat wav_demuxer; extern AVInputFormat wav_demuxer;
......
...@@ -716,6 +716,18 @@ AVOutputFormat mjpeg_muxer = { ...@@ -716,6 +716,18 @@ AVOutputFormat mjpeg_muxer = {
}; };
#endif //CONFIG_MUXERS #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 */ /* pcm formats */
#define PCMINPUTDEF(name, long_name, ext, codec) \ #define PCMINPUTDEF(name, long_name, ext, codec) \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment