Mercurial > mplayer.hg
changeset 35864:9b88b87f5921
Fix mplayer compilation.
FFmpeg no longer provides backward compatible CodecID as alias for AVCodecID.
| author | iive |
|---|---|
| date | Wed, 13 Mar 2013 02:18:17 +0000 |
| parents | 2e8a3822bd84 |
| children | 3b0d5a26815a |
| files | libmpcodecs/ad_spdif.c libmpdemux/demuxer.c libmpdemux/mp_taglists.c libmpdemux/mp_taglists.h sub/av_sub.c |
| diffstat | 5 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpcodecs/ad_spdif.c Tue Mar 12 21:46:01 2013 +0000 +++ b/libmpcodecs/ad_spdif.c Wed Mar 13 02:18:17 2013 +0000 @@ -82,7 +82,7 @@ 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 },
--- a/libmpdemux/demuxer.c Tue Mar 12 21:46:01 2013 +0000 +++ b/libmpdemux/demuxer.c Wed Mar 13 02:18:17 2013 +0000 @@ -476,7 +476,7 @@ #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();
--- a/libmpdemux/mp_taglists.c Tue Mar 12 21:46:01 2013 +0000 +++ b/libmpdemux/mp_taglists.c Wed Mar 13 02:18:17 2013 +0000 @@ -193,14 +193,14 @@ 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
--- a/libmpdemux/mp_taglists.h Tue Mar 12 21:46:01 2013 +0000 +++ b/libmpdemux/mp_taglists.h Wed Mar 13 02:18:17 2013 +0000 @@ -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 */
--- a/sub/av_sub.c Tue Mar 12 21:46:01 2013 +0000 +++ b/sub/av_sub.c Wed Mar 13 02:18:17 2013 +0000 @@ -84,7 +84,7 @@ 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;