summaryrefslogtreecommitdiff
path: root/src/libffmpeg/audio_decoder.c
diff options
context:
space:
mode:
authorMiguel Freitas <miguelfreitas@users.sourceforge.net>2005-10-23 02:11:16 +0000
committerMiguel Freitas <miguelfreitas@users.sourceforge.net>2005-10-23 02:11:16 +0000
commit712a40b59a0f451a558d88db1f9f124463016f97 (patch)
tree82bc80e9b7a5ba09c01acf205c8ac1e20c44914f /src/libffmpeg/audio_decoder.c
parent640063a719556f8569fe848528b39660c6fc31a6 (diff)
downloadxine-lib-712a40b59a0f451a558d88db1f9f124463016f97.tar.gz
xine-lib-712a40b59a0f451a558d88db1f9f124463016f97.tar.bz2
big ffmpeg update
it is likely to break, so please keep both pieces CVS patchset: 7767 CVS date: 2005/10/23 02:11:16
Diffstat (limited to 'src/libffmpeg/audio_decoder.c')
-rw-r--r--src/libffmpeg/audio_decoder.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/libffmpeg/audio_decoder.c b/src/libffmpeg/audio_decoder.c
index d40a39e6c..18cf3ff9e 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.17 2005/09/12 01:06:58 miguelfreitas Exp $
+ * $Id: audio_decoder.c,v 1.18 2005/10/23 02:11:16 miguelfreitas Exp $
*
* xine audio decoder plugin using ffmpeg
*
@@ -101,7 +101,8 @@ static const ff_codec_t ff_audio_lookup[] = {
{BUF_AUDIO_VMD, CODEC_ID_VMDAUDIO, "Sierra VMD Audio (ffmpeg)"},
{BUF_AUDIO_FLAC, CODEC_ID_FLAC, "FLAC (ffmpeg)"},
{BUF_AUDIO_SHORTEN, CODEC_ID_SHORTEN, "Shorten (ffmpeg)"},
- {BUF_AUDIO_ALAC, CODEC_ID_ALAC, "ALAC (ffmpeg)"} };
+ {BUF_AUDIO_ALAC, CODEC_ID_ALAC, "ALAC (ffmpeg)"},
+ {BUF_AUDIO_QDESIGN2, CODEC_ID_QDM2, "QDM2 (ffmpeg)"} };
static void ff_audio_ensure_buffer_size(ff_audio_decoder_t *this, int size) {
@@ -442,6 +443,7 @@ static uint32_t supported_audio_types[] = {
BUF_AUDIO_ALAC,
BUF_AUDIO_SHORTEN,
BUF_AUDIO_MPEG,
+ BUF_AUDIO_QDESIGN2,
0
};