[FFmpeg-devel] [PATCH] Fix sample_aspect_ratio computation for stereo matroska content.
acolwell at google.com
Tue Nov 24 04:46:14 CET 2015
On Mon, Nov 23, 2015 at 4:36 PM, Michael Niedermayer <michaelni at gmx.at>
> On Mon, Nov 23, 2015 at 08:37:40PM +0000, Aaron Colwell wrote:
> > matroskaenc.c applies divisors to the display width/height when
> > 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,
> > *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".
Sorry about that. It has been a while since I've submitted a patch. I've
attached the original patch file generated by git format-patch. I hope that
is ok. I wasn't sure if an attachment or just using 'git send-email' was
the preferred followup method.
-------------- next part --------------
A non-text attachment was scrubbed...
Size: 3470 bytes
Desc: not available
More information about the ffmpeg-devel