diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-04-09 18:12:59 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-04-09 18:12:59 +0400 |
| commit | efbc9d9043ff8ff92716ddd00a5f61412d535593 (patch) | |
| tree | 8f3e621f756cf1f5b4d64d97964c7e7abd8aaf08 /src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpc_helper.c | |
| parent | df6b139a6d9027156f614b68687e039e3a5854db (diff) | |
revert r1783
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1785 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpc_helper.c')
| -rw-r--r-- | src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpc_helper.c | 99 |
1 files changed, 46 insertions, 53 deletions
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpc_helper.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpc_helper.c index 5c205ef05..e11a54606 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpc_helper.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpc_helper.c @@ -31,70 +31,63 @@ int FFGetChannelMap(struct AVCodecContext * avctx)
{
- switch(avctx->codec_id)
- {
- case CODEC_ID_EAC3 :
- case CODEC_ID_AC3 :
- {
- AC3DecodeContext *s = avctx->priv_data;
+ 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;
+ // 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;
}
void* FF_aligned_malloc(size_t size, size_t alignment)
{
- return _aligned_malloc(size, alignment);
+ return _aligned_malloc(size,alignment);
}
void FF_aligned_free(void* mem_ptr)
{
- if(mem_ptr)
- _aligned_free(mem_ptr);
+ if (mem_ptr)
+ _aligned_free(mem_ptr);
}
-void* FF_aligned_realloc(void *ptr, size_t size, size_t alignment)
+void* FF_aligned_realloc(void *ptr,size_t size,size_t alignment)
{
- if(!ptr)
- return FF_aligned_malloc(size, alignment);
- else if(size == 0)
- {
- FF_aligned_free(ptr);
- return NULL;
- }
- else
- return _aligned_realloc(ptr, size, alignment);
+ if (!ptr)
+ return FF_aligned_malloc(size,alignment);
+ else
+ if (size==0)
+ {
+ FF_aligned_free(ptr);
+ return NULL;
+ }
+ else
+ return _aligned_realloc(ptr,size,alignment);
}
|