summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Melanson <mike@multimedia.cx>2002-09-13 03:03:42 +0000
committerMike Melanson <mike@multimedia.cx>2002-09-13 03:03:42 +0000
commit20b46c0027d3a0d64276a408a54e1c7cb8aef4ae (patch)
tree67a5c662425d7f02ea378d10e0e77937ce10f1c5 /src
parent37bbf407aef45a65dd5ff54586c0d2465c83f848 (diff)
downloadxine-lib-20b46c0027d3a0d64276a408a54e1c7cb8aef4ae.tar.gz
xine-lib-20b46c0027d3a0d64276a408a54e1c7cb8aef4ae.tar.bz2
reinstate some codec formats lost in API transition
CVS patchset: 2657 CVS date: 2002/09/13 03:03:42
Diffstat (limited to 'src')
-rw-r--r--src/libxineadec/adpcm.c5
-rw-r--r--src/libxinevdec/yuv.c3
2 files changed, 5 insertions, 3 deletions
diff --git a/src/libxineadec/adpcm.c b/src/libxineadec/adpcm.c
index f556e599c..1269f19ed 100644
--- a/src/libxineadec/adpcm.c
+++ b/src/libxineadec/adpcm.c
@@ -24,7 +24,7 @@
* formats can be found here:
* http://www.pcisys.net/~melanson/codecs/
*
- * $Id: adpcm.c,v 1.15 2002/09/05 22:19:01 mroi Exp $
+ * $Id: adpcm.c,v 1.16 2002/09/13 03:03:42 tmmm Exp $
*/
#include <stdio.h>
@@ -1153,7 +1153,8 @@ static void *init_audio_decoder_plugin (xine_t *xine, void *data) {
static uint32_t audio_types[] = {
BUF_AUDIO_MSADPCM, BUF_AUDIO_MSIMAADPCM,
BUF_AUDIO_QTIMAADPCM, BUF_AUDIO_DK3ADPCM,
- BUF_AUDIO_DK4ADPCM, 0
+ BUF_AUDIO_DK4ADPCM, BUF_AUDIO_SMJPEG_IMA,
+ BUF_AUDIO_VQA_IMA, 0
};
static decoder_info_t dec_info_audio = {
diff --git a/src/libxinevdec/yuv.c b/src/libxinevdec/yuv.c
index 7775f1884..a6e2d3d71 100644
--- a/src/libxinevdec/yuv.c
+++ b/src/libxinevdec/yuv.c
@@ -21,7 +21,7 @@
* Actually, this decoder just reorganizes chunks of raw YUV data in such
* a way that xine can display them.
*
- * $Id: yuv.c,v 1.6 2002/09/05 22:19:03 mroi Exp $
+ * $Id: yuv.c,v 1.7 2002/09/13 03:03:42 tmmm Exp $
*/
#include <stdio.h>
@@ -304,6 +304,7 @@ static void *init_video_decoder_plugin (xine_t *xine, void *data) {
static uint32_t video_types[] = {
BUF_VIDEO_YVU9,
+ BUF_VIDEO_GREY,
0
};