summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--src/libreal/audio_decoder.c13
-rw-r--r--src/libreal/xine_decoder.c8
3 files changed, 11 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 5caf8ab5f..d42bcfb0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
* build system improvements: replacement functions, better work with headers
+ * Set the codec name for Real Media even if we can't play the files
xine-lib (1-rc6)
* Moved win32 frontend into separate module.
diff --git a/src/libreal/audio_decoder.c b/src/libreal/audio_decoder.c
index 21a361e68..d37689a49 100644
--- a/src/libreal/audio_decoder.c
+++ b/src/libreal/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.39 2004/07/25 17:44:10 mroi Exp $
+ * $Id: audio_decoder.c,v 1.40 2004/09/21 14:23:20 hadess Exp $
*
* thin layer to use real binary-only codecs in xine
*
@@ -240,36 +240,35 @@ static int init_codec (realdec_decoder_t *this, buf_element_t *buf) {
switch (buf->type) {
case BUF_AUDIO_COOK:
+ _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "Cook");
if (!load_syms_linux (this, "cook.so.6.0"))
return 0;
-
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "Cook");
break;
case BUF_AUDIO_ATRK:
+ _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "Atrac");
if (!load_syms_linux (this, "atrc.so.6.0"))
return 0;
this->block_align = 384;
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "Atrac");
break;
case BUF_AUDIO_14_4:
+ _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "Real 14.4");
if (!load_syms_linux (this, "14_4.so.6.0"))
return 0;
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "Real 14.4");
break;
case BUF_AUDIO_28_8:
+ _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "Real 28.8");
if (!load_syms_linux (this, "28_8.so.6.0"))
return 0;
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "Real 28.8");
break;
case BUF_AUDIO_SIPRO:
+ _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "Sipro");
if (!load_syms_linux (this, "sipr.so.6.0"))
return 0;
/* this->block_align = 19; */
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "Sipro");
break;
default:
diff --git a/src/libreal/xine_decoder.c b/src/libreal/xine_decoder.c
index 6d34407c2..6528b4e6f 100644
--- a/src/libreal/xine_decoder.c
+++ b/src/libreal/xine_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: xine_decoder.c,v 1.72 2004/07/25 17:44:11 mroi Exp $
+ * $Id: xine_decoder.c,v 1.73 2004/09/21 14:23:20 hadess Exp $
*
* thin layer to use real binary-only codecs in xine
*
@@ -153,19 +153,19 @@ static int init_codec (realdec_decoder_t *this, buf_element_t *buf) {
switch (buf->type) {
case BUF_VIDEO_RV20:
+ _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Real Video 2.0");
if (!load_syms_linux (this, "drv2.so.6.0"))
return 0;
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Real Video 2.0");
break;
case BUF_VIDEO_RV30:
+ _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Real Video 3.0");
if (!load_syms_linux (this, "drv3.so.6.0"))
return 0;
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Real Video 3.0");
break;
case BUF_VIDEO_RV40:
+ _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Real Video 4.0");
if (!load_syms_linux(this, "drv4.so.6.0"))
return 0;
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Real Video 4.0");
break;
default:
xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,