[FFmpeg-cvslog] libx264: workaround a bug in some versions of flash player

Michael Niedermayer git at videolan.org
Fri Dec 9 22:57:30 CET 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec  9 22:34:11 2011 +0100| [4557d7d01fa204d0e21c5ca40604dd013b911c47] | committer: Michael Niedermayer

libx264: workaround a bug in some versions of flash player
Fixes Ticket570

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4557d7d01fa204d0e21c5ca40604dd013b911c47
---

 libavcodec/libx264.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index a31195b..38351e5 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -279,6 +279,7 @@ static int convert_pix_fmt(enum PixelFormat pix_fmt)
 static av_cold int X264_init(AVCodecContext *avctx)
 {
     X264Context *x4 = avctx->priv_data;
+    int sw,sh;
 
     x264_param_default(&x4->params);
 
@@ -507,8 +508,9 @@ static av_cold int X264_init(AVCodecContext *avctx)
 
     x4->params.i_width          = avctx->width;
     x4->params.i_height         = avctx->height;
-    x4->params.vui.i_sar_width  = avctx->sample_aspect_ratio.num;
-    x4->params.vui.i_sar_height = avctx->sample_aspect_ratio.den;
+    av_reduce(&sw, &sh, avctx->sample_aspect_ratio.num, avctx->sample_aspect_ratio.den, 4096);
+    x4->params.vui.i_sar_width  = sw;
+    x4->params.vui.i_sar_height = sh;
     x4->params.i_fps_num = x4->params.i_timebase_den = avctx->time_base.den;
     x4->params.i_fps_den = x4->params.i_timebase_num = avctx->time_base.num;
 



More information about the ffmpeg-cvslog mailing list