[FFmpeg-devel] [PATCH] lavf/matroskaenc.c: use metadata key/value to set mastering metadata

[Neil Birkbeck]

Updated patch attached.

On Sat, Apr 16, 2016 at 7:08 PM, Michael Niedermayer
<michael at niedermayer.cc> wrote:
> On Sun, Apr 03, 2016 at 03:38:33PM -0700, Neil Birkbeck wrote:
>> Use "master_display" key/value pair to specify mastering metadata in a
>> similar formatting as accepted by libx265 (unless there is some other
>> generic way to add side data to a stream from command line).
>> Currently, the packet side data propagates from an input file to
>> output file if it is transmuxed (mkv -> mkv). Perhaps we want to also
>> use this same metadata key in matroskadec to also allow for the
>> metadata to propagate during transcoding.
>
>>  matroskaenc.c |   51 +++++++++++++++++++++++++++++++++++++++++++++++----
>>  1 file changed, 47 insertions(+), 4 deletions(-)
>> d92564f3ec6cf08430a79b64f4d1ec304637afe1  0001-lavf-matroskaenc.c-use-metadata-key-value-to-set-mas.patch
>> From b30d80f6ba4b09811039f64af3e7f709d86df5fe Mon Sep 17 00:00:00 2001
>> From: Neil Birkbeck <neil.birkbeck at gmail.com>
>> Date: Fri, 1 Apr 2016 17:02:42 -0700
>> Subject: [PATCH] lavf/matroskaenc.c: use metadata key/value to set mastering
>>  metadata
>>
>> Add key/value metadata interface to allow command line setting of AVMasteringDisplayMetadata. The formatting is the same as the option in libx265.
>>
>> Signed-off-by: Neil Birkbeck <neil.birkbeck at gmail.com>
>
> this does not apply cleanly anymore after codecpar
>
> Applying: lavf/matroskaenc.c: use metadata key/value to set mastering metadata
> Using index info to reconstruct a base tree...
> Falling back to patching base and 3-way merge...
> Auto-merging libavformat/matroskaenc.c
> CONFLICT (content): Merge conflict in libavformat/matroskaenc.c
> Failed to merge in the changes.
> Patch failed at 0001 lavf/matroskaenc.c: use metadata key/value to set mastering metadata
> When you have resolved this problem run "git am --resolved".
> If you would prefer to skip this patch, instead run "git am --skip".
> To restore the original branch and stop patching run "git am --abort".
>
>
> [...]
>
> --
> Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
>
> Democracy is the form of government in which you can choose your dictator
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-lavf-matroskaenc.c-use-metadata-key-value-to-set-mas.patch
Type: application/octet-stream
Size: 4665 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20160419/544d4d3c/attachment.obj>