From: notaz <notasas@gmail.com>
Date: Thu, 23 Apr 2015 20:17:59 +0000 (+0300)
Subject: Merge pull request #26 from EXL/fix_avcodec_compile_errors
X-Git-Tag: v1.92~73
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce07c136bb10124ebb2029d5275e27ca2a6254af;hp=5ec48917cf32d7dffc73cc25acdf2381af80f496;p=picodrive.git

Merge pull request #26 from EXL/fix_avcodec_compile_errors

Fix avcodec compile errors
---

diff --git a/platform/common/mp3_libavcodec.c b/platform/common/mp3_libavcodec.c
index 2d3c799..9a528c1 100644
--- a/platform/common/mp3_libavcodec.c
+++ b/platform/common/mp3_libavcodec.c
@@ -16,6 +16,11 @@
 #include "../libpicofe/lprintf.h"
 #include "mp3.h"
 
+#if LIBAVCODEC_VERSION_MAJOR < 55
+#define AVCodecID CodecID
+#define AV_CODEC_ID_MP3 CODEC_ID_MP3
+#endif
+
 static AVCodecContext *ctx;
 
 /* avoid compile time linking to libavcodec due to huge list of it's deps..
@@ -94,7 +99,7 @@ int mp3dec_decode(FILE *f, int *file_pos, int file_len)
 int mp3dec_start(FILE *f, int fpos_start)
 {
 	void (*avcodec_register_all)(void);
-	AVCodec *(*avcodec_find_decoder)(enum CodecID id);
+	AVCodec *(*avcodec_find_decoder)(enum AVCodecID id);
 	AVCodecContext *(*avcodec_alloc_context)(void);
 	int (*avcodec_open)(AVCodecContext *avctx, AVCodec *codec);
 	void (*av_free)(void *ptr);
@@ -137,8 +142,7 @@ int mp3dec_start(FILE *f, int fpos_start)
 	//avcodec_init();
 	avcodec_register_all();
 
-	// AV_CODEC_ID_MP3 ?
-	codec = avcodec_find_decoder(CODEC_ID_MP3);
+	codec = avcodec_find_decoder(AV_CODEC_ID_MP3);
 	if (codec == NULL) {
 		lprintf("mp3dec: codec missing\n");
 		return -1;