diff options
author | wm4 <wm4@nowhere> | 2012-08-18 11:17:35 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-08-20 15:36:04 +0200 |
commit | 6a26b4a66504f701baf35e58467e55aea28c0ad5 (patch) | |
tree | 8b09b91d63926543eaa8ec95c90a2532bde71dd6 /libmpdemux/mp3_hdr.h | |
parent | 6f7ba66817b5cd3761b802930dc7ba62464e3c6a (diff) | |
download | mpv-6a26b4a66504f701baf35e58467e55aea28c0ad5.tar.bz2 mpv-6a26b4a66504f701baf35e58467e55aea28c0ad5.tar.xz |
libmpcodecs: remove redundant audio and video decoders
Probably all of these are supported by libavcodec. Missing things can
be added back.
Also remove qtpalette.h. It was used by demux_mov.c, and should have
been deleted with commit 1fde09db6f4ce.
Diffstat (limited to 'libmpdemux/mp3_hdr.h')
-rw-r--r-- | libmpdemux/mp3_hdr.h | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/libmpdemux/mp3_hdr.h b/libmpdemux/mp3_hdr.h deleted file mode 100644 index a9b34ac12c..0000000000 --- a/libmpdemux/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 <stddef.h> - -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 */ |