[MPlayer-cvslog] r29593 - in trunk/libmpdemux: demux_lavf.c mp_taglists.c mp_taglists.h

[cehoyos]

Author: cehoyos
Date: Mon Aug 31 01:01:36 2009
New Revision: 29593

Log:
Rename mp_wav_override_tag* as mp_codecid_override_tag* to reflect that
it now can be used for both audio and video.

Modified:
   trunk/libmpdemux/demux_lavf.c
   trunk/libmpdemux/mp_taglists.c
   trunk/libmpdemux/mp_taglists.h

Modified: trunk/libmpdemux/demux_lavf.c
==============================================================================
--- trunk/libmpdemux/demux_lavf.c	Mon Aug 31 00:55:21 2009	(r29592)
+++ trunk/libmpdemux/demux_lavf.c	Mon Aug 31 01:01:36 2009	(r29593)
@@ -221,7 +221,8 @@ static void handle_stream(demuxer_t *dem
     AVStream *st= avfc->streams[i];
     AVCodecContext *codec= st->codec;
     AVMetadataTag *lang = av_metadata_get(st->metadata, "language", NULL, 0);
-    int g, override_tag = av_codec_get_tag(mp_wav_override_taglists, codec->codec_id);
+    int g, override_tag = av_codec_get_tag(mp_codecid_override_taglists,
+                                           codec->codec_id);
     // For some formats (like PCM) always trust CODEC_ID_* more than codec_tag
     if (override_tag)
         codec->codec_tag = override_tag;

Modified: trunk/libmpdemux/mp_taglists.c
==============================================================================
--- trunk/libmpdemux/mp_taglists.c	Mon Aug 31 00:55:21 2009	(r29592)
+++ trunk/libmpdemux/mp_taglists.c	Mon Aug 31 01:01:36 2009	(r29593)
@@ -54,7 +54,7 @@ static const AVCodecTag mp_wav_tags[] = 
 
 const struct AVCodecTag *mp_wav_taglists[] = {ff_codec_wav_tags, mp_wav_tags, 0};
 
-static const AVCodecTag mp_wav_override_tags[] = {
+static const AVCodecTag mp_codecid_override_tags[] = {
     { CODEC_ID_PCM_S8,            MKTAG('t', 'w', 'o', 's')},
     { CODEC_ID_PCM_U8,            1},
     { CODEC_ID_PCM_S16BE,         MKTAG('t', 'w', 'o', 's')},
@@ -71,7 +71,8 @@ static const AVCodecTag mp_wav_override_
     { 0, 0 },
 };
 
-const struct AVCodecTag *mp_wav_override_taglists[] = {mp_wav_override_tags, 0};
+const struct AVCodecTag *mp_codecid_override_taglists[] =
+                        {mp_codecid_override_tags, 0};
 
 static const AVCodecTag mp_bmp_tags[] = {
     { CODEC_ID_AMV,               MKTAG('A', 'M', 'V', 'V')},

Modified: trunk/libmpdemux/mp_taglists.h
==============================================================================
--- trunk/libmpdemux/mp_taglists.h	Mon Aug 31 00:55:21 2009	(r29592)
+++ trunk/libmpdemux/mp_taglists.h	Mon Aug 31 01:01:36 2009	(r29593)
@@ -21,7 +21,7 @@
 
 extern const struct AVCodecTag *mp_wav_taglists[];
 
-extern const struct AVCodecTag *mp_wav_override_taglists[];
+extern const struct AVCodecTag *mp_codecid_override_taglists[];
 
 extern const struct AVCodecTag *mp_bmp_taglists[];