[SCM] libav/master: Bugfix: expects wrong preset file extension

[Reinhard Tartler]

I'll try to upstream this patch for 0.8.1

On Mon, Mar 5, 2012 at 7:49 PM,  <siretart at users.alioth.debian.org> wrote:
> The following commit has been merged in the master branch:
> commit 4735c18af08ef613913683b4a607da67c18c6612
> Author: Reinhard Tartler <siretart at tauware.de>
> Date:   Mon Mar 5 19:46:32 2012 +0100
>
>    Bugfix: expects wrong preset file extension
>
>    Closes: #660978
>
> diff --git a/debian/patches/02-fix-avpreset-extension.patch b/debian/patches/02-fix-avpreset-extension.patch
> new file mode 100644
> index 0000000..bbecd45
> --- /dev/null
> +++ b/debian/patches/02-fix-avpreset-extension.patch
> @@ -0,0 +1,68 @@
> +Author: Reinhard Tartler <siretart at tauware.de>
> +Subject: ffmpeg-0.8 expects wrong preset file extension (.ffpreset instead of .avpreset)
> +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=660978
> +
> +diff --git a/cmdutils.c b/cmdutils.c
> +index a489a0f..e96fa81 100644
> +--- a/cmdutils.c
> ++++ b/cmdutils.c
> +@@ -883,12 +883,12 @@ FILE *get_preset_file(char *filename, size_t filename_size,
> +         for (i = 0; i < 3 && !f; i++) {
> +             if (!base[i])
> +                 continue;
> +-            snprintf(filename, filename_size, "%s%s/%s.ffpreset", base[i],
> ++            snprintf(filename, filename_size, "%s%s/%s.avpreset", base[i],
> +                      i != 1 ? "" : "/.avconv", preset_name);
> +             f = fopen(filename, "r");
> +             if (!f && codec_name) {
> +                 snprintf(filename, filename_size,
> +-                         "%s%s/%s-%s.ffpreset",
> ++                         "%s%s/%s-%s.avpreset",
> +                          base[i], i != 1 ? "" : "/.avconv", codec_name,
> +                          preset_name);
> +                 f = fopen(filename, "r");
> +diff --git a/cmdutils.h b/cmdutils.h
> +index eb96645..c69bb02 100644
> +--- a/cmdutils.h
> ++++ b/cmdutils.h
> +@@ -345,11 +345,11 @@ int64_t guess_correct_pts(PtsCorrectionContext *ctx, int64_t pts, int64_t dts);
> +  * Get a file corresponding to a preset file.
> +  *
> +  * If is_path is non-zero, look for the file in the path preset_name.
> +- * Otherwise search for a file named arg.ffpreset in the directories
> ++ * Otherwise search for a file named arg.avpreset in the directories
> +  * $AVCONV_DATADIR (if set), $HOME/.avconv, and in the datadir defined
> +  * at configuration time, in that order. If no such file is found and
> +  * codec_name is defined, then search for a file named
> +- * codec_name-preset_name.ffpreset in the above-mentioned directories.
> ++ * codec_name-preset_name.avpreset in the above-mentioned directories.
> +  *
> +  * @param filename buffer where the name of the found filename is written
> +  * @param filename_size size in bytes of the filename buffer
> +diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
> +index 968d4f6..0e0c646 100644
> +--- a/doc/ffmpeg.texi
> ++++ b/doc/ffmpeg.texi
> +@@ -805,18 +805,18 @@ The argument passed to the @code{vpre}, @code{apre}, and @code{spre}
> + preset options identifies the preset file to use according to the
> + following rules:
> +
> +-First ffmpeg searches for a file named @var{arg}.ffpreset in the
> ++First ffmpeg searches for a file named @var{arg}.avpreset in the
> + directories @file{$AVCONV_DATADIR} (if set), and @file{$HOME/.avconv}, and in
> + the datadir defined at configuration time (usually @file{PREFIX/share/avconv})
> + in that order. For example, if the argument is @code{libx264-max}, it will
> +-search for the file @file{libx264-max.ffpreset}.
> ++search for the file @file{libx264-max.avpreset}.
> +
> + If no such file is found, then ffmpeg will search for a file named
> +- at var{codec_name}- at var{arg}.ffpreset in the above-mentioned
> ++ at var{codec_name}- at var{arg}.avpreset in the above-mentioned
> + directories, where @var{codec_name} is the name of the codec to which
> + the preset file options will be applied. For example, if you select
> + the video codec with @code{-vcodec libx264} and use @code{-vpre max},
> +-then it will search for the file @file{libx264-max.ffpreset}.
> ++then it will search for the file @file{libx264-max.avpreset}.
> + @c man end
> +
> + @chapter Tips
> diff --git a/debian/patches/series b/debian/patches/series
> index 7cc079d..dad55b8 100644
> --- a/debian/patches/series
> +++ b/debian/patches/series
> @@ -1,4 +1,5 @@
>  01-Tweak-doxygen-config.patch
> +02-fix-avpreset-extension.patch
>  03-disable-configuration-warnings.patch
>
>  # post-0.8 patches
>
> --
> Libav/FFmpeg packaging
>
> _______________________________________________
> pkg-multimedia-commits mailing list
> pkg-multimedia-commits at lists.alioth.debian.org
> http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-commits



-- 
regards,
    Reinhard