]>
Commit | Line | Data |
---|---|---|
4b619c2f | 1 | --- deadbeef-0.5.1/plugins/ffmpeg/ffmpeg.c~ 2011-05-22 15:58:53.000000000 +0200 |
f3f43983 | 2 | +++ deadbeef-0.5.1/plugins/ffmpeg/ffmpeg.c 2011-06-30 10:24:44.386376024 +0200 |
4b619c2f | 3 | @@ -140,7 +140,7 @@ |
4 | for (i = 0; i < info->fctx->nb_streams; i++) | |
5 | { | |
6 | info->ctx = info->fctx->streams[i]->codec; | |
7 | - if (info->ctx->codec_type == CODEC_TYPE_AUDIO) | |
8 | + if (info->ctx->codec_type == AVMEDIA_TYPE_AUDIO) | |
9 | { | |
10 | info->codec = avcodec_find_decoder (info->ctx->codec_id); | |
11 | if (info->codec != NULL) { | |
12 | @@ -490,7 +490,7 @@ | |
13 | for (i = 0; i < fctx->nb_streams; i++) | |
14 | { | |
15 | ctx = fctx->streams[i]->codec; | |
16 | - if (ctx->codec_type == CODEC_TYPE_AUDIO) | |
17 | + if (ctx->codec_type == AVMEDIA_TYPE_AUDIO) | |
18 | { | |
19 | codec = avcodec_find_decoder(ctx->codec_id); | |
20 | if (codec != NULL && !strcasecmp (codec->name, "alac")) { // only open alac streams | |
f3f43983 | 21 | @@ -704,7 +704,7 @@ |
22 | ffmpeg_init_exts (); | |
23 | avcodec_init (); | |
24 | av_register_all (); | |
25 | - av_register_protocol (&vfswrapper); | |
31dfbc91 | 26 | + av_register_protocol2 (&vfswrapper, sizeof(vfswrapper)); |
f3f43983 | 27 | return 0; |
28 | } | |
29 | ||
4b619c2f | 30 | @@ -745,7 +745,7 @@ |
31 | for (i = 0; i < fctx->nb_streams; i++) | |
32 | { | |
33 | ctx = fctx->streams[i]->codec; | |
34 | - if (ctx->codec_type == CODEC_TYPE_AUDIO) | |
35 | + if (ctx->codec_type == AVMEDIA_TYPE_AUDIO) | |
36 | { | |
37 | codec = avcodec_find_decoder(ctx->codec_id); | |
38 | if (codec != NULL) |