diff options
author | Aurelien Jacobs <aurel@gnuage.org> | 2010-08-29 21:37:37 +0000 |
---|---|---|
committer | Aurelien Jacobs <aurel@gnuage.org> | 2010-08-29 21:37:37 +0000 |
commit | 99392a6111eac44875dfc47eab2a0ea1eb4d24ae (patch) | |
tree | 0c0aabe7b3538daa9aeaa496ec9a39efdb4f311e /libavformat/raw.c | |
parent | b30593c7dbfc860a79475feac42ea740dbb537c8 (diff) | |
download | ffmpeg-99392a6111eac44875dfc47eab2a0ea1eb4d24ae.tar.gz |
move h261 demuxer to its own file
Originally committed as revision 24980 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/raw.c')
-rw-r--r-- | libavformat/raw.c | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/libavformat/raw.c b/libavformat/raw.c index 1b57c5edaa..ac6882b3f7 100644 --- a/libavformat/raw.c +++ b/libavformat/raw.c @@ -241,47 +241,6 @@ int ff_raw_video_read_header(AVFormatContext *s, } #endif -#if CONFIG_H261_DEMUXER -static int h261_probe(AVProbeData *p) -{ - uint32_t code= -1; - int i; - int valid_psc=0; - int invalid_psc=0; - int next_gn=0; - int src_fmt=0; - GetBitContext gb; - - init_get_bits(&gb, p->buf, p->buf_size*8); - - for(i=0; i<p->buf_size*8; i++){ - if ((code & 0x01ff0000) || !(code & 0xff00)) { - code = (code<<8) + get_bits(&gb, 8); - i += 7; - } else - code = (code<<1) + get_bits1(&gb); - if ((code & 0xffff0000) == 0x10000) { - int gn= (code>>12)&0xf; - if(!gn) - src_fmt= code&8; - if(gn != next_gn) invalid_psc++; - else valid_psc++; - - if(src_fmt){ // CIF - next_gn= (gn+1 )%13; - }else{ //QCIF - next_gn= (gn+1+!!gn)% 7; - } - } - } - if(valid_psc > 2*invalid_psc + 6){ - return 50; - }else if(valid_psc > 2*invalid_psc + 2) - return 25; - return 0; -} -#endif - #if CONFIG_DIRAC_DEMUXER static int dirac_probe(AVProbeData *p) { @@ -513,20 +472,6 @@ AVInputFormat gsm_demuxer = { }; #endif -#if CONFIG_H261_DEMUXER -AVInputFormat h261_demuxer = { - "h261", - NULL_IF_CONFIG_SMALL("raw H.261"), - 0, - h261_probe, - ff_raw_video_read_header, - ff_raw_read_partial_packet, - .flags= AVFMT_GENERIC_INDEX, - .extensions = "h261", - .value = CODEC_ID_H261, -}; -#endif - #if CONFIG_H261_MUXER AVOutputFormat h261_muxer = { "h261", |