[FFmpeg-devel] [PATCH 6/6] fate: change lavf.ffm ref.

Hendrik Leppkes h.leppkes at gmail.com
Wed Aug 19 15:42:25 CEST 2015


On Wed, Aug 19, 2015 at 3:20 PM, Ronald S. Bultje <rsbultje at gmail.com> wrote:
> Hi guys,
>
> On Mon, Aug 17, 2015 at 11:52 AM, Ronald S. Bultje <rsbultje at gmail.com>
> wrote:
>
>> (This should only be applied when we bump version.) Removing the -ab
>> option changes the codec settings serialization, so the ffm ref changes
>> whenever we bump version and remove -ab.
>> ---
>>  tests/ref/lavf/ffm | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/tests/ref/lavf/ffm b/tests/ref/lavf/ffm
>> index 5de2f39..76b7716 100644
>> --- a/tests/ref/lavf/ffm
>> +++ b/tests/ref/lavf/ffm
>> @@ -1,3 +1,3 @@
>> -d5d4e5e3eec336ae6680dde035870564 *./tests/data/lavf/lavf.ffm
>> +4c3d2892c1d1be292f7b91788a0f7e17 *./tests/data/lavf/lavf.ffm
>>  376832 ./tests/data/lavf/lavf.ffm
>>  ./tests/data/lavf/lavf.ffm CRC=0x000e23ae
>> --
>> 2.1.2
>
>
> So, uhm, I'd like to get the last few patches in. I want to consider some
> options for this one, specifically. The diff between old and new .ffm is
> this:
>
> $ strings /tmp/old.ffm|grep ^b=|tr ',' '\n'>/tmp/old.ffm.hdr
> $ strings /tmp/new.ffm|grep ^b=|tr ',' '\n'>/tmp/new.ffm.hdr
> $ diff -u /tmp/{old,new}.ffm.hdr
> --- /tmp/old.ffm.hdr 2015-08-19 09:17:06.000000000 -0400
> +++ /tmp/new.ffm.hdr 2015-08-19 09:17:15.000000000 -0400
> @@ -1,5 +1,4 @@
>  b=64000
> -ab=64000
>  flags=0x00800000
>  ar=44100
>  ac=1
>
> And this happens upon version bump if we consider "ab" deprecated (which I
> do). I can introduce a FF_OPT_FLAG_DEPRECATED in lavu/internal.h, mark "ab"
> as such, and handle that flag in opt_serialize. I could even mark that flag
> (in addition to being private) under FF_API_OLD_AVOPTIONS, so that it
> magically disappears upon version bump.
>
> We can also just wait for version bump and then apply this patch right
> after FF_API_OLD_AVOPTIONS becomes 0.
>

I think just applying it when needed is probably best. No huge effort,
just need to remember it after the bump.

- Hendrik


More information about the ffmpeg-devel mailing list