From 94fda5687adb6a31519e61c6420adf99b923b7be Mon Sep 17 00:00:00 2001 From: Sergey Bolshakov Date: Wed, 22 Jun 2011 19:03:55 +0400 Subject: [PATCH] adapted for libav-0.7 --- deadbeef/plugins/ffmpeg/ffmpeg.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/deadbeef/plugins/ffmpeg/ffmpeg.c b/deadbeef/plugins/ffmpeg/ffmpeg.c index cd7edf4..89f0042 100644 --- a/deadbeef/plugins/ffmpeg/ffmpeg.c +++ b/deadbeef/plugins/ffmpeg/ffmpeg.c @@ -140,7 +140,7 @@ ffmpeg_init (DB_fileinfo_t *_info, DB_playItem_t *it) { for (i = 0; i < info->fctx->nb_streams; i++) { info->ctx = info->fctx->streams[i]->codec; - if (info->ctx->codec_type == CODEC_TYPE_AUDIO) + if (info->ctx->codec_type == AVMEDIA_TYPE_AUDIO) { info->codec = avcodec_find_decoder (info->ctx->codec_id); if (info->codec != NULL) { @@ -490,7 +490,7 @@ ffmpeg_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) { for (i = 0; i < fctx->nb_streams; i++) { ctx = fctx->streams[i]->codec; - if (ctx->codec_type == CODEC_TYPE_AUDIO) + if (ctx->codec_type == AVMEDIA_TYPE_AUDIO) { codec = avcodec_find_decoder(ctx->codec_id); if (codec != NULL && !strcasecmp (codec->name, "alac")) { // only open alac streams @@ -704,7 +704,11 @@ ffmpeg_start (void) { ffmpeg_init_exts (); avcodec_init (); av_register_all (); +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 53, 0, 0 ) + av_register_protocol2(&vfswrapper, sizeof(vfswrapper)); +#else av_register_protocol (&vfswrapper); +#endif return 0; } @@ -745,7 +749,7 @@ ffmpeg_read_metadata (DB_playItem_t *it) { for (i = 0; i < fctx->nb_streams; i++) { ctx = fctx->streams[i]->codec; - if (ctx->codec_type == CODEC_TYPE_AUDIO) + if (ctx->codec_type == AVMEDIA_TYPE_AUDIO) { codec = avcodec_find_decoder(ctx->codec_id); if (codec != NULL) -- 1.7.5.4