virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avcodec/mpegaudiodecheader: remove dead code

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2017-11-11 01:39:47 -03:00
parent 700da852b5
commit 006546c635
2 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/mpegaudiodecheader.c
View File

@@ -152,15 +152,3 @@ int ff_mpa_decode_header(uint32_t head, int *sample_rate, int *channels, int *fr
*bit_rate = s->bit_rate; *bit_rate = s->bit_rate;
return s->frame_size; return s->frame_size;
} }
#if LIBAVCODEC_VERSION_MAJOR < 58
int avpriv_mpa_decode_header2(uint32_t head, int *sample_rate, int *channels, int *frame_size, int *bit_rate, enum AVCodecID *codec_id)
{
return ff_mpa_decode_header(head, sample_rate, channels, frame_size, bit_rate, codec_id);
}
int avpriv_mpa_decode_header(AVCodecContext *avctx, uint32_t head, int *sample_rate, int *channels, int *frame_size, int *bit_rate)
{
return ff_mpa_decode_header(head, sample_rate, channels, frame_size, bit_rate, &avctx->codec_id);
}
#endif

5
libavcodec/mpegaudiodecheader.h
View File

@@ -57,11 +57,6 @@ int avpriv_mpegaudio_decode_header(MPADecodeHeader *s, uint32_t header);
int ff_mpa_decode_header(uint32_t head, int *sample_rate, int ff_mpa_decode_header(uint32_t head, int *sample_rate,
int *channels, int *frame_size, int *bitrate, enum AVCodecID *codec_id); int *channels, int *frame_size, int *bitrate, enum AVCodecID *codec_id);
#if LIBAVCODEC_VERSION_MAJOR < 58
int avpriv_mpa_decode_header(AVCodecContext *avctx, uint32_t head, int *sample_rate, int *channels, int *frame_size, int *bitrate);
int avpriv_mpa_decode_header2(uint32_t head, int *sample_rate, int *channels, int *frame_size, int *bitrate, enum AVCodecID *codec_id);
#endif
/* fast header check for resync */ /* fast header check for resync */
static inline int ff_mpa_check_header(uint32_t header){ static inline int ff_mpa_check_header(uint32_t header){
/* header */ /* header */