summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Melanson <mike@multimedia.cx>2004-03-14 20:40:39 +0000
committerMike Melanson <mike@multimedia.cx>2004-03-14 20:40:39 +0000
commit14288fcc88e072c31bcb59a3797125b6899d54a9 (patch)
tree1e19e9aefcafafecb57cc2eaadf65c536389623f
parent22d3536b79f0b1efc3c335bd6e8b75225c67a443 (diff)
downloadxine-lib-14288fcc88e072c31bcb59a3797125b6899d54a9.tar.gz
xine-lib-14288fcc88e072c31bcb59a3797125b6899d54a9.tar.bz2
hey, I've always wondered who was in charge of all that MPEG decoding
CVS patchset: 6251 CVS date: 2004/03/14 20:40:39
-rw-r--r--src/libmad/xine_decoder.c10
-rw-r--r--src/libmpeg2/decode.c2
2 files changed, 6 insertions, 6 deletions
diff --git a/src/libmad/xine_decoder.c b/src/libmad/xine_decoder.c
index 9ed255a8d..6bcb703d3 100644
--- a/src/libmad/xine_decoder.c
+++ b/src/libmad/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.50 2004/01/12 17:35:16 miguelfreitas Exp $
+ * $Id: xine_decoder.c,v 1.51 2004/03/14 20:40:39 tmmm Exp $
*
* stuff needed to turn libmad into a xine decoder plugin
*/
@@ -203,19 +203,19 @@ static void mad_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
switch (this->frame.header.layer) {
case MAD_LAYER_I:
_x_meta_info_set(this->xstream, XINE_META_INFO_AUDIOCODEC,
- "MPEG audio layer 1");
+ "MPEG audio layer 1 (lib: MAD)");
break;
case MAD_LAYER_II:
_x_meta_info_set(this->xstream, XINE_META_INFO_AUDIOCODEC,
- "MPEG audio layer 2");
+ "MPEG audio layer 2 (lib: MAD)");
break;
case MAD_LAYER_III:
_x_meta_info_set(this->xstream, XINE_META_INFO_AUDIOCODEC,
- "MPEG audio layer 3");
+ "MPEG audio layer 3 (lib: MAD)");
break;
default:
_x_meta_info_set(this->xstream, XINE_META_INFO_AUDIOCODEC,
- "MPEG audio");
+ "MPEG audio (lib: MAD)");
}
}
diff --git a/src/libmpeg2/decode.c b/src/libmpeg2/decode.c
index 4324d1f1d..50e531931 100644
--- a/src/libmpeg2/decode.c
+++ b/src/libmpeg2/decode.c
@@ -239,7 +239,7 @@ static void remember_metainfo (mpeg2dec_t *mpeg2dec) {
_x_stream_info_set(mpeg2dec->stream, XINE_STREAM_INFO_FRAME_DURATION, 3000);
}
- _x_meta_info_set(mpeg2dec->stream, XINE_META_INFO_VIDEOCODEC, "MPEG");
+ _x_meta_info_set(mpeg2dec->stream, XINE_META_INFO_VIDEOCODEC, "MPEG (libmpeg2)");
}