summaryrefslogtreecommitdiff
path: root/src/libffmpeg
diff options
context:
space:
mode:
authorClaudio Ciccani <klan@users.sourceforge.net>2006-12-15 11:31:28 +0000
committerClaudio Ciccani <klan@users.sourceforge.net>2006-12-15 11:31:28 +0000
commit1f4418dd9bfbc4110cd761afb6b832f261acf516 (patch)
treeb4aacbc7f86bc7e5c3dc1712d826f06414aedcb9 /src/libffmpeg
parentd5030fca994e66508095b50b7d88237afe16d9ca (diff)
downloadxine-lib-1f4418dd9bfbc4110cd761afb6b832f261acf516.tar.gz
xine-lib-1f4418dd9bfbc4110cd761afb6b832f261acf516.tar.bz2
Added BUF_AUDIO_FLVADPCM (Flash ADPCM).
CVS patchset: 8418 CVS date: 2006/12/15 11:31:28
Diffstat (limited to 'src/libffmpeg')
-rw-r--r--src/libffmpeg/audio_decoder.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libffmpeg/audio_decoder.c b/src/libffmpeg/audio_decoder.c
index c0a4503e2..16d2bc234 100644
--- a/src/libffmpeg/audio_decoder.c
+++ b/src/libffmpeg/audio_decoder.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: audio_decoder.c,v 1.29 2006/10/13 21:41:30 dgp85 Exp $
+ * $Id: audio_decoder.c,v 1.30 2006/12/15 11:31:29 klan Exp $
*
* xine audio decoder plugin using ffmpeg
*
@@ -107,6 +107,7 @@ static const ff_codec_t ff_audio_lookup[] = {
{BUF_AUDIO_TRUESPEECH, CODEC_ID_TRUESPEECH, "TrueSpeech (ffmpeg)"},
{BUF_AUDIO_TTA, CODEC_ID_TTA, "True Audio Lossless (ffmpeg)"},
{BUF_AUDIO_SMACKER, CODEC_ID_SMACKAUDIO, "Smacker (ffmpeg)"},
+ {BUF_AUDIO_FLVADPCM, CODEC_ID_ADPCM_SWF, "Flash ADPCM (ffmpeg)"},
};
@@ -472,6 +473,7 @@ static uint32_t supported_audio_types[] = {
BUF_AUDIO_TRUESPEECH,
BUF_AUDIO_TTA,
BUF_AUDIO_SMACKER,
+ BUF_AUDIO_FLVADPCM,
0
};