From d8bde114fd9685111274713c03985c72de3377b1 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 9 Mar 2013 08:49:56 +0100 Subject: Prefix CODEC_ID_ with AV_ The old names have been deprecated a while ago, but were needed for supporting older ffmpeg/libav versions. The deprecated identifiers have been removed from recent Libav and FFmpeg git. This change breaks compatibility with Libav 0.8.x and equivalent FFmpeg releases. --- demux/demux_lavf.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'demux/demux_lavf.c') diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c index 50f9f1e8f0..843bd171e4 100644 --- a/demux/demux_lavf.c +++ b/demux/demux_lavf.c @@ -403,22 +403,22 @@ static void handle_stream(demuxer_t *demuxer, AVFormatContext *avfc, int i) case AVMEDIA_TYPE_SUBTITLE: { sh_sub_t *sh_sub; char type; - if (codec->codec_id == CODEC_ID_TEXT || + if (codec->codec_id == AV_CODEC_ID_TEXT || codec->codec_id == AV_CODEC_ID_SUBRIP) type = 't'; - else if (codec->codec_id == CODEC_ID_MOV_TEXT) + else if (codec->codec_id == AV_CODEC_ID_MOV_TEXT) type = 'm'; - else if (codec->codec_id == CODEC_ID_SSA) + else if (codec->codec_id == AV_CODEC_ID_SSA) type = 'a'; - else if (codec->codec_id == CODEC_ID_DVD_SUBTITLE) + else if (codec->codec_id == AV_CODEC_ID_DVD_SUBTITLE) type = 'v'; - else if (codec->codec_id == CODEC_ID_XSUB) + else if (codec->codec_id == AV_CODEC_ID_XSUB) type = 'x'; - else if (codec->codec_id == CODEC_ID_DVB_SUBTITLE) + else if (codec->codec_id == AV_CODEC_ID_DVB_SUBTITLE) type = 'b'; - else if (codec->codec_id == CODEC_ID_DVB_TELETEXT) + else if (codec->codec_id == AV_CODEC_ID_DVB_TELETEXT) type = 'd'; - else if (codec->codec_id == CODEC_ID_HDMV_PGS_SUBTITLE) + else if (codec->codec_id == AV_CODEC_ID_HDMV_PGS_SUBTITLE) type = 'p'; else break; @@ -440,7 +440,7 @@ static void handle_stream(demuxer_t *demuxer, AVFormatContext *avfc, int i) AVDictionaryEntry *ftag = av_dict_get(st->metadata, "filename", NULL, 0); char *filename = ftag ? ftag->value : NULL; - if (st->codec->codec_id == CODEC_ID_TTF) + if (st->codec->codec_id == AV_CODEC_ID_TTF) demuxer_add_attachment(demuxer, bstr0(filename), bstr0("application/x-truetype-font"), (struct bstr){codec->extradata, -- cgit v1.2.3