diff options
author | wm4 <wm4@nowhere> | 2013-03-09 08:49:56 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-03-13 23:51:30 +0100 |
commit | d8bde114fd9685111274713c03985c72de3377b1 (patch) | |
tree | a5bbfbc0423a557e559752d5bd9f5bf957d7415d /sub | |
parent | ba5fc1d5e6c7d0762cd051edc80011faa9ab6a6a (diff) | |
download | mpv-d8bde114fd9685111274713c03985c72de3377b1.tar.bz2 mpv-d8bde114fd9685111274713c03985c72de3377b1.tar.xz |
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.
Diffstat (limited to 'sub')
-rw-r--r-- | sub/sd_lavc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sub/sd_lavc.c b/sub/sd_lavc.c index f1f93b480e..e3f7af408a 100644 --- a/sub/sd_lavc.c +++ b/sub/sd_lavc.c @@ -65,16 +65,16 @@ static int init(struct sh_sub *sh, struct osd_state *osd) if (sh->initialized) return 0; struct sd_lavc_priv *priv = talloc_zero(NULL, struct sd_lavc_priv); - enum CodecID cid = CODEC_ID_NONE; + enum AVCodecID cid = AV_CODEC_ID_NONE; switch (sh->type) { case 'b': - cid = CODEC_ID_DVB_SUBTITLE; break; + cid = AV_CODEC_ID_DVB_SUBTITLE; break; case 'p': - cid = CODEC_ID_HDMV_PGS_SUBTITLE; break; + cid = AV_CODEC_ID_HDMV_PGS_SUBTITLE; break; case 'x': - cid = CODEC_ID_XSUB; break; + cid = AV_CODEC_ID_XSUB; break; case 'v': - cid = CODEC_ID_DVD_SUBTITLE; break; + cid = AV_CODEC_ID_DVD_SUBTITLE; break; } AVCodecContext *ctx = NULL; AVCodec *sub_codec = avcodec_find_decoder(cid); |