Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/alsa-plugins/patches/alsa-plugins-1.0.26-ffmpeg.patch

    Contents of /trunk/alsa-plugins/patches/alsa-plugins-1.0.26-ffmpeg.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 1937 - (show annotations) (download)
    Sat Nov 3 13:21:30 2012 UTC (11 years, 5 months ago) by niro
    File size: 1553 byte(s) 
    -added patch to fix build against new ffmpeg
    1 Ffmpeg 0.11 (LIBAVCODEC_VERSION_MAJOR = 54) removed the CH_LAYOUT_* aliases for
    2 the AV_CH_LAYOUT_* defines.
    3
    4 diff -pru alsa-plugins-1.0.25-original/a52/pcm_a52.c alsa-plugins-1.0.25-for-ffmpeg-0.11/a52/pcm_a52.c
    5 --- alsa-plugins-1.0.25-original/a52/pcm_a52.c 2012-01-25 08:57:07.000000000 +0100
    6 +++ alsa-plugins-1.0.25-for-ffmpeg-0.11/a52/pcm_a52.c 2012-06-01 14:59:47.096671464 +0200
    7 @@ -441,7 +441,21 @@ static int a52_prepare(snd_pcm_ioplug_t
    8 #else
    9 rec->avctx->sample_fmt = SAMPLE_FMT_S16;
    10 #endif
    11 -#if LIBAVCODEC_VERSION_MAJOR > 52 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 3)
    12 +#if (LIBAVCODEC_VERSION_MAJOR >= 54)
    13 + switch (io->channels) {
    14 + case 2:
    15 + rec->avctx->channel_layout = AV_CH_LAYOUT_STEREO;
    16 + break;
    17 + case 4:
    18 + rec->avctx->channel_layout = AV_CH_LAYOUT_QUAD;
    19 + break;
    20 + case 6:
    21 + rec->avctx->channel_layout = AV_CH_LAYOUT_5POINT1;
    22 + break;
    23 + default:
    24 + break;
    25 + }
    26 +#elif (LIBAVCODEC_VERSION_MAJOR > 52 && LIBAVCODEC_VERSION_MAJOR < 54) || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 3)
    27 switch (io->channels) {
    28 case 2:
    29 rec->avctx->channel_layout = CH_LAYOUT_STEREO;
    30 diff -u -r alsa-plugins-1.0.25/a52/pcm_a52.c alsa-plugins-1.0.25-ffmpeg/a52/pcm_a52.c
    31 --- alsa-plugins-1.0.25/a52/pcm_a52.c 2012-01-25 08:57:07.000000000 +0100
    32 +++ alsa-plugins-1.0.25-ffmpeg/a52/pcm_a52.c 2012-06-09 00:42:52.177219012 +0200
    33 @@ -702,7 +702,6 @@
    34 rec->channels = channels;
    35 rec->format = format;
    36
    37 - avcodec_init();
    38 avcodec_register_all();
    39
    40 rec->codec = avcodec_find_encoder_by_name("ac3_fixed");