On 11/10/14 2:59 PM, Clément Bœsch wrote:
> ---
> libavcodec/ass.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/libavcodec/ass.c b/libavcodec/ass.c
> index ac1bfae..62981b6 100644
> --- a/libavcodec/ass.c
> +++ b/libavcodec/ass.c
> @@ -34,6 +34,7 @@ int ff_ass_subtitle_header(AVCodecContext *avctx,
> {
> avctx->subtitle_header = av_asprintf(
> "[Script Info]\r\n"
> + "%s" /* FFmpeg signature */
> "ScriptType: v4.00+\r\n"
> "PlayResX: 384\r\n"
> "PlayResY: 288\r\n"
> @@ -65,6 +66,7 @@ int ff_ass_subtitle_header(AVCodecContext *avctx,
> "\r\n"
> "[Events]\r\n"
> "Format: Layer, Start, End, Style, Name, MarginL, MarginR,
> MarginV, Effect, Text\r\n",
> + (avctx->flags & CODEC_FLAG_BITEXACT) ? "; Script generated by
> FFmpeg/Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION) "\r\n" : "",
> font, font_size, color, color, back_color, back_color,
> -bold, -italic, -underline, alignment);
I think you wanted to do the inverse here. You can't use version macros when
bitexact
is requested.
I'd say put "; Script generated by FFmpeg/Lavc\r\n" for bitexact cases, and ";
Script
generated by FFmpeg/" LIBAVCODEC_IDENT "\r\n" otherwise.
That way a signature is always added.
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
