[FFmpeg-devel] [PATCH] Fix sample_aspect_ratio computation for stereo matroska content.

Michael Niedermayer michaelni at gmx.at
Tue Nov 24 01:36:36 CET 2015

On Mon, Nov 23, 2015 at 08:37:40PM +0000, Aaron Colwell wrote:
> matroskaenc.c applies divisors to the display width/height when generating
> stereo content. This patch adds the corresponding multipliers to
> matroskadec.c
> so that the original sample aspect ratio can be recovered.
> ---
>  libavformat/matroskadec.c | 34 ++++++++++++++++++++++++++++++++--
>  1 file changed, 32 insertions(+), 2 deletions(-)
> diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
> index 424d7bf..f05ddd6 100644
> --- a/libavformat/matroskadec.c
> +++ b/libavformat/matroskadec.c
> @@ -1648,6 +1648,30 @@ static int matroska_parse_flac(AVFormatContext *s,
>      return 0;
>  }
> +static void mkv_stereo_mode_display_mul(int stereo_mode, int *h_width, int
> *h_height)

this patch is corrupted by newlines

Applying: Fix sample_aspect_ratio computation for stereo matroska content.
fatal: corrupt patch at line 14
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Fix sample_aspect_ratio computation for stereo matroska content.
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

It is what and why we do it that matters, not just one of them.
-------------- 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/20151124/d20b2b17/attachment.sig>

More information about the ffmpeg-devel mailing list