diff options
author | aurel <aurel@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-09-01 22:37:50 +0000 |
---|---|---|
committer | aurel <aurel@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-09-01 22:37:50 +0000 |
commit | bae94777d7ddaa2d4763507fdb93b9520327c9d1 (patch) | |
tree | 2608214b0450153e0bfb16269c9ae07fbf890a8e | |
parent | 83651c8bfa3146e2ea984100754319a09d1a665e (diff) | |
download | mpv-bae94777d7ddaa2d4763507fdb93b9520327c9d1.tar.bz2 mpv-bae94777d7ddaa2d4763507fdb93b9520327c9d1.tar.xz |
support E-AC-3 decoding using ffmpeg
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27514 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | etc/codecs.conf | 7 | ||||
-rw-r--r-- | libmpdemux/extension.c | 1 | ||||
-rw-r--r-- | libmpdemux/mp_taglists.c | 1 |
3 files changed, 9 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 5f24280c69..c8c06023e4 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -3271,6 +3271,13 @@ audiocodec ffac3 driver ffmpeg dll ac3 +audiocodec ffeac3 + info "FFmpeg E-AC-3" + status working + fourcc EAC3 + driver ffmpeg + dll eac3 + audiocodec dts info "DTS-libdca" status working diff --git a/libmpdemux/extension.c b/libmpdemux/extension.c index a1cd2a49d2..88cc17f3a7 100644 --- a/libmpdemux/extension.c +++ b/libmpdemux/extension.c @@ -61,6 +61,7 @@ static struct { { "ac3", DEMUXER_TYPE_LAVF }, { "ape", DEMUXER_TYPE_LAVF }, { "apl", DEMUXER_TYPE_LAVF }, + { "eac3",DEMUXER_TYPE_LAVF }, { "mac", DEMUXER_TYPE_LAVF }, { "str", DEMUXER_TYPE_LAVF }, diff --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c index cc46274e63..275112ac1a 100644 --- a/libmpdemux/mp_taglists.c +++ b/libmpdemux/mp_taglists.c @@ -33,6 +33,7 @@ static const AVCodecTag mp_wav_tags[] = { { CODEC_ID_AMR_NB, MKTAG('n', 'b', 0, 0)}, { CODEC_ID_COOK, MKTAG('c', 'o', 'o', 'k')}, { CODEC_ID_DSICINAUDIO, MKTAG('D', 'C', 'I', 'A')}, + { CODEC_ID_EAC3, MKTAG('E', 'A', 'C', '3')}, { CODEC_ID_INTERPLAY_DPCM, MKTAG('I', 'N', 'P', 'A')}, { CODEC_ID_MLP, MKTAG('M', 'L', 'P', ' ')}, { CODEC_ID_MUSEPACK7, MKTAG('M', 'P', 'C', ' ')}, |