diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2010-08-29 21:23:30 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2010-08-29 21:23:30 +0000 |
| commit | e35070582e1be55ef502fbb0339472fdf8f35d89 (patch) | |
| tree | 23e8bbe75b795de6f95d661060385c3986a0c4f1 /libavformat/raw.c | |
| parent | c3ed4b2d38047153d992dee13b50148482aaaf6e (diff) | |
move m4v demuxer to its own file
Originally committed as revision 24976 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/raw.c')
| -rw-r--r-- | libavformat/raw.c | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/libavformat/raw.c b/libavformat/raw.c index 33c6cdcdc1..3c59277147 100644 --- a/libavformat/raw.c +++ b/libavformat/raw.c @@ -241,35 +241,6 @@ int ff_raw_video_read_header(AVFormatContext *s, } #endif -#if CONFIG_M4V_DEMUXER -#define VISUAL_OBJECT_START_CODE 0x000001b5 -#define VOP_START_CODE 0x000001b6 - -static int mpeg4video_probe(AVProbeData *probe_packet) -{ - uint32_t temp_buffer= -1; - int VO=0, VOL=0, VOP = 0, VISO = 0, res=0; - int i; - - for(i=0; i<probe_packet->buf_size; i++){ - temp_buffer = (temp_buffer<<8) + probe_packet->buf[i]; - if ((temp_buffer & 0xffffff00) != 0x100) - continue; - - if (temp_buffer == VOP_START_CODE) VOP++; - else if (temp_buffer == VISUAL_OBJECT_START_CODE) VISO++; - else if (temp_buffer < 0x120) VO++; - else if (temp_buffer < 0x130) VOL++; - else if ( !(0x1AF < temp_buffer && temp_buffer < 0x1B7) - && !(0x1B9 < temp_buffer && temp_buffer < 0x1C4)) res++; - } - - if ( VOP >= VISO && VOP >= VOL && VO >= VOL && VOL > 0 && res==0) - return AVPROBE_SCORE_MAX/2; - return 0; -} -#endif - #if CONFIG_H264_DEMUXER static int h264_probe(AVProbeData *p) { @@ -735,20 +706,6 @@ AVOutputFormat cavsvideo_muxer = { }; #endif -#if CONFIG_M4V_DEMUXER -AVInputFormat m4v_demuxer = { - "m4v", - NULL_IF_CONFIG_SMALL("raw MPEG-4 video format"), - 0, - mpeg4video_probe, /** probing for MPEG-4 data */ - ff_raw_video_read_header, - ff_raw_read_partial_packet, - .flags= AVFMT_GENERIC_INDEX, - .extensions = "m4v", - .value = CODEC_ID_MPEG4, -}; -#endif - #if CONFIG_M4V_MUXER AVOutputFormat m4v_muxer = { "m4v", |