[MPlayer-cvslog] r35958 - in trunk: libmpcodecs/ad_spdif.c libmpdemux/demuxer.c libmpdemux/mp_taglists.c libmpdemux/mp_taglists.h sub/av_sub.c

[iive]

Author: iive
Date: Wed Mar 13 03:18:17 2013
New Revision: 35958

Log:
Fix mplayer compilation.

FFmpeg no longer provides backward compatible CodecID as alias for AVCodecID.

Modified:
   trunk/libmpcodecs/ad_spdif.c
   trunk/libmpdemux/demuxer.c
   trunk/libmpdemux/mp_taglists.c
   trunk/libmpdemux/mp_taglists.h
   trunk/sub/av_sub.c

Modified: trunk/libmpcodecs/ad_spdif.c
==============================================================================
--- trunk/libmpcodecs/ad_spdif.c	Tue Mar 12 22:46:01 2013	(r35957)
+++ trunk/libmpcodecs/ad_spdif.c	Wed Mar 13 03:18:17 2013	(r35958)
@@ -82,7 +82,7 @@ static int init(sh_audio_t *sh)
     unsigned char *start;
     double pts;
     static const struct {
-        const char *name; enum CodecID id;
+        const char *name; enum AVCodecID id;
     } fmt_id_type[] = {
         { "aac" , AV_CODEC_ID_AAC    },
         { "ac3" , AV_CODEC_ID_AC3    },

Modified: trunk/libmpdemux/demuxer.c
==============================================================================
--- trunk/libmpdemux/demuxer.c	Tue Mar 12 22:46:01 2013	(r35957)
+++ trunk/libmpdemux/demuxer.c	Wed Mar 13 03:18:17 2013	(r35958)
@@ -476,7 +476,7 @@ static void ds_add_packet_internal(demux
 #ifdef CONFIG_FFMPEG
 static void allocate_parser(AVCodecContext **avctx, AVCodecParserContext **parser, unsigned format)
 {
-    enum CodecID codec_id = AV_CODEC_ID_NONE;
+    enum AVCodecID codec_id = AV_CODEC_ID_NONE;
 
     init_avcodec();
 

Modified: trunk/libmpdemux/mp_taglists.c
==============================================================================
--- trunk/libmpdemux/mp_taglists.c	Tue Mar 12 22:46:01 2013	(r35957)
+++ trunk/libmpdemux/mp_taglists.c	Wed Mar 13 03:18:17 2013	(r35958)
@@ -193,14 +193,14 @@ static void get_taglists(const struct AV
     dst[2] = NULL;
 }
 
-enum CodecID mp_tag2codec_id(uint32_t tag, int audio)
+enum AVCodecID mp_tag2codec_id(uint32_t tag, int audio)
 {
     const struct AVCodecTag *taglists[3];
     get_taglists(taglists, audio);
     return av_codec_get_id(taglists, tag);
 }
 
-uint32_t mp_codec_id2tag(enum CodecID codec_id, uint32_t old_tag, int audio)
+uint32_t mp_codec_id2tag(enum AVCodecID codec_id, uint32_t old_tag, int audio)
 {
     const struct AVCodecTag *taglists[3];
     // For some formats (like PCM) always trust AV_CODEC_ID_* more than codec_tag

Modified: trunk/libmpdemux/mp_taglists.h
==============================================================================
--- trunk/libmpdemux/mp_taglists.h	Tue Mar 12 22:46:01 2013	(r35957)
+++ trunk/libmpdemux/mp_taglists.h	Wed Mar 13 03:18:17 2013	(r35958)
@@ -23,7 +23,7 @@
 #include "libavutil/common.h"
 #include "libavformat/avformat.h"
 
-enum CodecID mp_tag2codec_id(uint32_t tag, int audio);
-uint32_t mp_codec_id2tag(enum CodecID codec_id, uint32_t old_tag, int audio);
+enum AVCodecID mp_tag2codec_id(uint32_t tag, int audio);
+uint32_t mp_codec_id2tag(enum AVCodecID codec_id, uint32_t old_tag, int audio);
 
 #endif /* MPLAYER_MP_TAGLISTS_H */

Modified: trunk/sub/av_sub.c
==============================================================================
--- trunk/sub/av_sub.c	Tue Mar 12 22:46:01 2013	(r35957)
+++ trunk/sub/av_sub.c	Wed Mar 13 03:18:17 2013	(r35958)
@@ -84,7 +84,7 @@ int decode_avsub(struct sh_sub *sh, uint
                  double *pts, double *endpts)
 {
     AVCodecContext *ctx = sh->context;
-    enum CodecID cid = AV_CODEC_ID_NONE;
+    enum AVCodecID cid = AV_CODEC_ID_NONE;
     int new_type = 0;
     int res;
     int got_sub;