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 /demux/demux.c | |
| 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 'demux/demux.c')
| -rw-r--r-- | demux/demux.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/demux/demux.c b/demux/demux.c index a99a050ee2..eaf1062cb2 100644 --- a/demux/demux.c +++ b/demux/demux.c @@ -496,18 +496,18 @@ void ds_add_packet(demux_stream_t *ds, demux_packet_t *dp) static void allocate_parser(AVCodecContext **avctx, AVCodecParserContext **parser, const char *format) { - enum CodecID codec_id = mp_codec_to_av_codec_id(format); + enum AVCodecID codec_id = mp_codec_to_av_codec_id(format); switch (codec_id) { - case CODEC_ID_AAC_LATM: - case CODEC_ID_AC3: - case CODEC_ID_EAC3: - case CODEC_ID_DTS: - case CODEC_ID_FLAC: - case CODEC_ID_MLP: - case CODEC_ID_MP3: - case CODEC_ID_MP2: - case CODEC_ID_TRUEHD: + case AV_CODEC_ID_AAC_LATM: + case AV_CODEC_ID_AC3: + case AV_CODEC_ID_EAC3: + case AV_CODEC_ID_DTS: + case AV_CODEC_ID_FLAC: + case AV_CODEC_ID_MLP: + case AV_CODEC_ID_MP3: + case AV_CODEC_ID_MP2: + case AV_CODEC_ID_TRUEHD: *avctx = avcodec_alloc_context3(NULL); if (!*avctx) return; |