Merge remote-tracking branch 'qatar/release/0.8' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 25 Oct 2012 15:18:59 +0000 (17:18 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 25 Oct 2012 15:18:59 +0000 (17:18 +0200)
* qatar/release/0.8:
  svq3: replace unsafe pointer casting with intreadwrite macros
  Update Changelog for the 0.8.4 Release
  lavc: remove stats_out from the options table.
  Prepare for 0.8.4 Release
  tiffenc: Check av_malloc() results.
  mpegaudiodec: fix short_start calculation
  h264: avoid stuck buffer pointer in decode_nal_units
  vf_pad/scale: use double precision for aspect ratios.
  yuv4mpeg: return proper error codes.
  smacker audio: sign-extend the initial 16-bit predicted value

Conflicts:
Changelog
RELEASE
libavfilter/vf_pad.c
libavfilter/vf_scale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/h264.c
libavcodec/mpegaudiodec.c
libavcodec/options.c
libavcodec/svq3.c
libavcodec/tiffenc.c
libavfilter/vf_pad.c
libavfilter/vf_scale.c
libavformat/yuv4mpeg.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -151,10 -156,7 +151,10 @@@ static int config_input(AVFilterLink *i
      var_values[VAR_IN_H]  = var_values[VAR_IH] = inlink->h;
      var_values[VAR_OUT_W] = var_values[VAR_OW] = NAN;
      var_values[VAR_OUT_H] = var_values[VAR_OH] = NAN;
-     var_values[VAR_A]     = (float) inlink->w / inlink->h;
+     var_values[VAR_A]     = (double) inlink->w / inlink->h;
 +    var_values[VAR_SAR]   = inlink->sample_aspect_ratio.num ?
-         (float) inlink->sample_aspect_ratio.num / inlink->sample_aspect_ratio.den : 1;
++        (double) inlink->sample_aspect_ratio.num / inlink->sample_aspect_ratio.den : 1;
 +    var_values[VAR_DAR]   = var_values[VAR_A] * var_values[VAR_SAR];
      var_values[VAR_HSUB]  = 1<<pad->hsub;
      var_values[VAR_VSUB]  = 1<<pad->vsub;
  
@@@ -154,10 -151,9 +154,12 @@@ static int config_props(AVFilterLink *o
      var_values[VAR_IN_H]  = var_values[VAR_IH] = inlink->h;
      var_values[VAR_OUT_W] = var_values[VAR_OW] = NAN;
      var_values[VAR_OUT_H] = var_values[VAR_OH] = NAN;
-     var_values[VAR_A]     = (float) inlink->w / inlink->h;
 -    var_values[VAR_DAR]   = var_values[VAR_A]  = (double) inlink->w / inlink->h;
++    var_values[VAR_A]     = (double) inlink->w / inlink->h;
++
      var_values[VAR_SAR]   = inlink->sample_aspect_ratio.num ?
-         (float) inlink->sample_aspect_ratio.num / inlink->sample_aspect_ratio.den : 1;
++
+         (double) inlink->sample_aspect_ratio.num / inlink->sample_aspect_ratio.den : 1;
 +    var_values[VAR_DAR]   = var_values[VAR_A] * var_values[VAR_SAR];
      var_values[VAR_HSUB]  = 1<<av_pix_fmt_descriptors[inlink->format].log2_chroma_w;
      var_values[VAR_VSUB]  = 1<<av_pix_fmt_descriptors[inlink->format].log2_chroma_h;
  
Simple merge