diff options
author | Aurelien Jacobs <aurel@gnuage.org> | 2010-08-29 21:51:47 +0000 |
---|---|---|
committer | Aurelien Jacobs <aurel@gnuage.org> | 2010-08-29 21:51:47 +0000 |
commit | 66e35c5fc6174d7da3e3013340aa866163b98ca7 (patch) | |
tree | d048a52c4123cd1095ce9ecef32f42b2b1551fb9 /libavformat/raw.c | |
parent | 170a250f7d348c583b017f1d8d01dd2d037b0134 (diff) |
move dnxhd demuxer to its own file
Originally committed as revision 24982 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/raw.c')
-rw-r--r-- | libavformat/raw.c | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/libavformat/raw.c b/libavformat/raw.c index 2708e0e191..7504b7e81a 100644 --- a/libavformat/raw.c +++ b/libavformat/raw.c @@ -241,26 +241,6 @@ int ff_raw_video_read_header(AVFormatContext *s, } #endif -#if CONFIG_DNXHD_DEMUXER -static int dnxhd_probe(AVProbeData *p) -{ - static const uint8_t header[] = {0x00,0x00,0x02,0x80,0x01}; - int w, h, compression_id; - if (p->buf_size < 0x2c) - return 0; - if (memcmp(p->buf, header, 5)) - return 0; - h = AV_RB16(p->buf + 0x18); - w = AV_RB16(p->buf + 0x1a); - if (!w || !h) - return 0; - compression_id = AV_RB32(p->buf + 0x28); - if (compression_id < 1237 || compression_id > 1253) - return 0; - return AVPROBE_SCORE_MAX; -} -#endif - #if CONFIG_AC3_DEMUXER || CONFIG_EAC3_DEMUXER static int ac3_eac3_probe(AVProbeData *p, enum CodecID expected_codec_id) { @@ -363,19 +343,6 @@ AVOutputFormat dirac_muxer = { }; #endif -#if CONFIG_DNXHD_DEMUXER -AVInputFormat dnxhd_demuxer = { - "dnxhd", - NULL_IF_CONFIG_SMALL("raw DNxHD (SMPTE VC-3)"), - 0, - dnxhd_probe, - ff_raw_video_read_header, - ff_raw_read_partial_packet, - .flags= AVFMT_GENERIC_INDEX, - .value = CODEC_ID_DNXHD, -}; -#endif - #if CONFIG_DNXHD_MUXER AVOutputFormat dnxhd_muxer = { "dnxhd", |