diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/combined/ffmpeg/ffmpeg_decoder.c | 3 | ||||
| -rw-r--r-- | src/combined/ffmpeg/xine_audio.list | 1 | ||||
| -rw-r--r-- | src/xine-engine/buffer.h | 1 | ||||
| -rw-r--r-- | src/xine-engine/buffer_types.c | 7 |
4 files changed, 12 insertions, 0 deletions
diff --git a/src/combined/ffmpeg/ffmpeg_decoder.c b/src/combined/ffmpeg/ffmpeg_decoder.c index 6d0bfa432..b50633053 100644 --- a/src/combined/ffmpeg/ffmpeg_decoder.c +++ b/src/combined/ffmpeg/ffmpeg_decoder.c @@ -180,6 +180,9 @@ void avcodec_register_all(void) REGISTER_DECODER(AC3, ac3); #endif REGISTER_ENCODER(AC3, ac3); +#ifdef CODEC_ID_EAC3 + REGISTER_DECODER(EAC3, eac3); +#endif REGISTER_DECODER(ALAC, alac); #if defined(CONFIG_AMR_NB) || defined(CONFIG_AMR_NB_FIXED) REGISTER_ENCDEC (AMR_NB, amr_nb); diff --git a/src/combined/ffmpeg/xine_audio.list b/src/combined/ffmpeg/xine_audio.list index 9ec727bf1..5daa4d8b0 100644 --- a/src/combined/ffmpeg/xine_audio.list +++ b/src/combined/ffmpeg/xine_audio.list @@ -41,6 +41,7 @@ FLVADPCM ADPCM_SWF Flash ADPCM WAVPACK WAVPACK WavPack AMR_NB AMR_NB AMR narrow band AMR_WB AMR_WB AMR wide band +EAC3 EAC3 E-AC-3 # disabled codecs (ref. configure.ac) ! AAC diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h index 3b25c732e..034f6552a 100644 --- a/src/xine-engine/buffer.h +++ b/src/xine-engine/buffer.h @@ -260,6 +260,7 @@ extern "C" { #define BUF_AUDIO_MP3ADU 0x033E0000 #define BUF_AUDIO_AMR_NB 0x033F0000 #define BUF_AUDIO_AMR_WB 0x03400000 +#define BUF_AUDIO_EAC3 0x03410000 /* spu buffer types: */ diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c index 33a09b907..1db073851 100644 --- a/src/xine-engine/buffer_types.c +++ b/src/xine-engine/buffer_types.c @@ -1176,6 +1176,13 @@ static const audio_db_t audio_db[] = { BUF_AUDIO_TTA, "True Audio Lossless" }, +{ + { + 0 + }, + BUF_AUDIO_EAC3, + "E-AC-3" +}, { { 0 }, 0, "last entry" } }; |