[FFmpeg-devel] [PATCH] Map description metadata to ©inf tag in .mov wrapper

[Michael Niedermayer]

On Thu, Nov 19, 2015 at 11:20:04AM -0500, Brian Wheeler wrote:
> The description metadata isn't mapped to anything when the mov
> wrapper is used.    This patch maps description to ©inf for both
> reading and writing.
> The change to mov.c makes the mapping round-trip.
> 
> Signed-off-by: Brian Wheeler <bdwheele at indiana.edu>
> ---
>  libavformat/mov.c    | 2 +-
>  libavformat/movenc.c | 1 +
>  2 files changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/libavformat/mov.c b/libavformat/mov.c
> index 0eb7272..960667f 100644
> --- a/libavformat/mov.c
> +++ b/libavformat/mov.c
> @@ -342,7 +342,7 @@ static int mov_read_udta_string(MOVContext *c,
> AVIOContext *pb, MOVAtom atom)
>      case MKTAG(0xa9,'g','e','n'): key = "genre";     break;

this is corrupted by extra newlines

Applying: Map description metadata to ©inf tag in .mov wrapper
fatal: corrupt patch at line 11
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Map description metadata to ©inf tag in .mov wrapper
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

What does censorship reveal? It reveals fear. -- Julian Assange
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20151120/21c99910/attachment.sig>