RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 15:27:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #26 from EXL/fix_avcodec_compile_errors

Browse source 
Fix avcodec compile errors
This commit is contained in:
notaz 2015-04-23 23:17:59 +03:00
commit ce07c136bb
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
platform/common/mp3_libavcodec.c
View file

@ -16,6 +16,11 @@
#include "../libpicofe/lprintf.h" #include "../libpicofe/lprintf.h"
#include "mp3.h" #include "mp3.h"
#if LIBAVCODEC_VERSION_MAJOR < 55
#define AVCodecID CodecID
#define AV_CODEC_ID_MP3 CODEC_ID_MP3
#endif
static AVCodecContext *ctx; static AVCodecContext *ctx;
/* avoid compile time linking to libavcodec due to huge list of it's deps.. /* 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) int mp3dec_start(FILE *f, int fpos_start)
{ {
void (*avcodec_register_all)(void); void (*avcodec_register_all)(void);
AVCodec *(*avcodec_find_decoder)(enum CodecID id); AVCodec *(*avcodec_find_decoder)(enum AVCodecID id);
AVCodecContext *(*avcodec_alloc_context)(void); AVCodecContext *(*avcodec_alloc_context)(void);
int (*avcodec_open)(AVCodecContext *avctx, AVCodec *codec); int (*avcodec_open)(AVCodecContext *avctx, AVCodec *codec);
void (*av_free)(void *ptr); void (*av_free)(void *ptr);
@ -137,8 +142,7 @@ int mp3dec_start(FILE *f, int fpos_start)
//avcodec_init(); //avcodec_init();
avcodec_register_all(); avcodec_register_all();
// AV_CODEC_ID_MP3 ? codec = avcodec_find_decoder(AV_CODEC_ID_MP3);
codec = avcodec_find_decoder(CODEC_ID_MP3);
if (codec == NULL) { if (codec == NULL) {
lprintf("mp3dec: codec missing\n"); lprintf("mp3dec: codec missing\n");
return -1; return -1;