[FFmpeg-devel] [PATCH 43/87] avformat/mov, movenc: Enc exporting rotation via metadata

[Michael Niedermayer]

On Mon, Apr 19, 2021 at 11:09:40AM -0300, James Almer wrote:
> From: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
> 
> Deprecated in ddef3d902f0e4cbd6be6b3e5df7ec158ce51488b.
> 
> (The reference file of the mov-zombie test needed to be updated, because
> a rotate metadata tag is no longer exported; the side-data is of course
> still present.)
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
> ---
>  libavformat/mov.c         | 14 --------------
>  libavformat/movenc.c      | 15 ---------------
>  libavformat/version.h     |  3 ---
>  tests/ref/fate/mov-zombie |  2 +-
>  4 files changed, 1 insertion(+), 33 deletions(-)

it seems this doesnt want to apply

Applying: avformat/mov, movenc: Enc exporting rotation via metadata
Using index info to reconstruct a base tree...
M	libavformat/mov.c
error: patch failed: tests/ref/fate/mov-zombie:194
error: tests/ref/fate/mov-zombie: patch does not apply
error: Did you hand edit your patch?
It does not apply to blobs recorded in its index.
Patch failed at 0001 avformat/mov, movenc: Enc exporting rotation via metadata
hint: Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Probably its related to the long line

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

"I am not trying to be anyone's saviour, I'm trying to think about the
 future and not be sad" - Elon Musk

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20210419/dbe1419c/attachment.sig>