diff options
author | v0lt <v0lt@users.sourceforge.net> | 2012-06-10 19:25:48 +0400 |
---|---|---|
committer | v0lt <v0lt@users.sourceforge.net> | 2012-06-10 19:25:48 +0400 |
commit | 6a4c2d09e8ff376c505210f71c07a26342eb03e9 (patch) | |
tree | ca1ee11e9128346f33f31f74fb69a110c6df72b6 | |
parent | b502cc847b9d99695cabf8c7289f5c6b9a8f3b1b (diff) |
ffmpeg: removed unnecessary FFGetChannelMap function
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@5076 10f7b99b-c216-0410-bff0-8a66a9350fd8
-rw-r--r-- | src/thirdparty/ffmpeg/libavcodec/avcodec.h | 3 | ||||
-rw-r--r-- | src/thirdparty/ffmpeg/libavcodec/mpc_helper.c | 40 |
2 files changed, 0 insertions, 43 deletions
diff --git a/src/thirdparty/ffmpeg/libavcodec/avcodec.h b/src/thirdparty/ffmpeg/libavcodec/avcodec.h index 7b0861e0f..c2ff972f8 100644 --- a/src/thirdparty/ffmpeg/libavcodec/avcodec.h +++ b/src/thirdparty/ffmpeg/libavcodec/avcodec.h @@ -4742,7 +4742,4 @@ int av_codec_is_decoder(AVCodec *codec); FF_EXPORT int avcodec_h264_search_recovery_point(AVCodecContext *avctx,
const uint8_t *buf, int buf_size, int *recovery_frame_cnt);
-/* MPC-HC specific functions */
-FF_EXPORT int FFGetChannelMap(struct AVCodecContext* avctx);
-
#endif /* AVCODEC_AVCODEC_H */
diff --git a/src/thirdparty/ffmpeg/libavcodec/mpc_helper.c b/src/thirdparty/ffmpeg/libavcodec/mpc_helper.c index d9e0eff4c..7ae3fd88e 100644 --- a/src/thirdparty/ffmpeg/libavcodec/mpc_helper.c +++ b/src/thirdparty/ffmpeg/libavcodec/mpc_helper.c @@ -19,8 +19,6 @@ */
#include "avcodec.h"
-#include "ac3.h"
-#include "ac3dec.h"
#if defined(DEBUG) || defined(_DEBUG)
#define COMPILER " Debug"
@@ -56,44 +54,6 @@ #define COMPILER_SSE ""
#endif
-
-int FFGetChannelMap(struct AVCodecContext *avctx)
-{
- switch (avctx->codec_id)
- {
- case CODEC_ID_EAC3:
- case CODEC_ID_AC3:
- {
- AC3DecodeContext *s = avctx->priv_data;
-
- // Mapping index for s_scmap_ac3
- switch (s->channel_mode)
- {
- case AC3_CHMODE_DUALMONO: return 0;
- case AC3_CHMODE_MONO: return 1;
- case AC3_CHMODE_STEREO: return 2;
- case AC3_CHMODE_3F: return 3;
- case AC3_CHMODE_2F1R: return 4;
- case AC3_CHMODE_3F1R: return 5;
- case AC3_CHMODE_2F2R: return 6;
- case AC3_CHMODE_3F2R: return (s->lfe_on ? 8 : 7);
- }
- }
- break;
- case CODEC_ID_MLP:
- {
- // Mapping index for s_scmap_lpcm
- if (avctx->channels <= 8)
- return avctx->channels - 1;
- else
- return -1;
- }
- default:
- return 2;
- }
- return -1;
-}
-
static char g_Gcc_Compiler[31];
char* GetFFmpegCompiler()
|