From d8bde114fd9685111274713c03985c72de3377b1 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
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.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'demux/demux.c')

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;
-- 
cgit v1.2.3