From af0c41e162725b0edcd6c3d066a2dbef05a3b896 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 7 Jul 2013 23:54:11 +0200 Subject: Remove old demuxers Delete demux_avi, demux_asf, demux_mpg, demux_ts. libavformat does better than them (except in rare corner cases), and the demuxers have a bad influence on the rest of the code. Often they don't output proper packets, and require additional audio and video parsing. Most work only in --no-correct-pts mode. Remove them to facilitate further cleanups. --- demux/mp3_hdr.h | 36 ------------------------------------ 1 file changed, 36 deletions(-) delete mode 100644 demux/mp3_hdr.h (limited to 'demux/mp3_hdr.h') diff --git a/demux/mp3_hdr.h b/demux/mp3_hdr.h deleted file mode 100644 index a9b34ac12c..0000000000 --- a/demux/mp3_hdr.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of MPlayer. - * - * MPlayer is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * MPlayer is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef MPLAYER_MP3_HDR_H -#define MPLAYER_MP3_HDR_H - -#include - -int mp_get_mp3_header(unsigned char* hbuf,int* chans, int* freq, int* spf, int* mpa_layer, int* br); - -#define mp_decode_mp3_header(hbuf) mp_get_mp3_header(hbuf,NULL,NULL,NULL,NULL,NULL) - -static inline int mp_check_mp3_header(unsigned int head){ - unsigned char tmp[4] = {head >> 24, head >> 16, head >> 8, head}; - if( (head & 0xffe00000) != 0xffe00000 || - (head & 0x00000c00) == 0x00000c00) return 0; - if(mp_decode_mp3_header(tmp)<=0) return 0; - return 1; -} - -#endif /* MPLAYER_MP3_HDR_H */ -- cgit v1.2.3