Commit 004f8aab authored by Gildas Bazin's avatar Gildas Bazin

* modules/codec/ffmpeg/encoder.c: reverted commit 10351 which breaks aspect ratio encoding.

parent d1ba6299
...@@ -346,10 +346,13 @@ int E_(OpenEncoder)( vlc_object_t *p_this ) ...@@ -346,10 +346,13 @@ int E_(OpenEncoder)( vlc_object_t *p_this )
p_context->b_frame_strategy = 0; p_context->b_frame_strategy = 0;
#if LIBAVCODEC_BUILD >= 4687 #if LIBAVCODEC_BUILD >= 4687
av_reduce( &p_context->sample_aspect_ratio.num, av_reduce( &i_aspect_num, &i_aspect_den,
&p_context->sample_aspect_ratio.den,
p_enc->fmt_in.video.i_aspect, p_enc->fmt_in.video.i_aspect,
VOUT_ASPECT_FACTOR, 1 << 30 /* something big */ ); VOUT_ASPECT_FACTOR, 1 << 30 /* something big */ );
av_reduce( &p_context->sample_aspect_ratio.num,
&p_context->sample_aspect_ratio.den,
i_aspect_num * (int64_t)p_context->height,
i_aspect_den * (int64_t)p_context->width, 1 << 30 );
#else #else
p_context->aspect_ratio = ((float)p_enc->fmt_in.video.i_aspect) / p_context->aspect_ratio = ((float)p_enc->fmt_in.video.i_aspect) /
VOUT_ASPECT_FACTOR; VOUT_ASPECT_FACTOR;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment