Merge remote branch 'qatar/master'

* qatar/master: (23 commits)
  ac3enc: correct the flipped sign in the ac3_fixed encoder
  Eliminate pointless '#if 1' statements without matching '#else'.
  Add AVX FFT implementation.
  Increase alignment of av_malloc() as needed by AVX ASM.
  Update x86inc.asm from x264 to allow AVX emulation using SSE and MMX.
  mjpeg: Detect overreads in mjpeg_decode_scan() and error out.
  documentation: extend documentation for ffmpeg -aspect option
  APIChanges: update commit hashes for recent additions.
  lavc: deprecate FF_*_TYPE macros in favor of AV_PICTURE_TYPE_* enums
  aac: add headers needed for log2f()
  lavc: remove FF_API_MB_Q cruft
  lavc: remove FF_API_RATE_EMU cruft
  lavc: remove FF_API_HURRY_UP cruft
  pad: make the filter parametric
  vsrc_movie: add key_frame and pict_type.
  vsrc_movie: fix leak in request_frame()
  lavfi: add key_frame and pict_type to AVFilterBufferRefVideo.
  vsrc_buffer: add sample_aspect_ratio fields to arguments.
  lavfi: add fieldorder filter
  scale: make the filter parametric
  ...

Conflicts:
	Changelog
	doc/filters.texi
	ffmpeg.c
	libavcodec/ac3dec.h
	libavcodec/dsputil.c
	libavfilter/avfilter.h
	libavfilter/vf_scale.c
	libavfilter/vf_yadif.c
	libavfilter/vsrc_buffer.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc Changelog
index 5deaceb,144f55c..146fb88
--- 1/Changelog
--- 2/Changelog
+++ b/Changelog
@@@ -4,13 -4,8 +4,13 @@@ releases are sorted from youngest to ol
  
  version <next>:
  
 +- many many things we forgot because we rather write code than changelogs
 +- libmpcodecs video filter support (3 times as many filters than before)
 +- mpeg2 aspect ratio dection fixed
 +- libxvid aspect pickiness fixed
 +- Frame multithreaded decoding
  - Lots of deprecated API cruft removed
- 
+ - fft and imdct optimizations for AVX (Sandy Bridge) processors
  
  version 0.7_beta1:
  

diff --cc doc/APIchanges
Simple merge

diff --cc ffmpeg.c
Simple merge

diff --cc ffserver.c
Simple merge

diff --cc libavcodec/aac.h
Simple merge

diff --cc libavcodec/aaccoder.c
Simple merge

diff --cc libavcodec/aacenc.h
Simple merge

diff --cc libavcodec/aacsbr.c
Simple merge

diff --cc libavcodec/ac3dec.h
index 91008e5,6cba95b..d3fe3e7
--- 1/libavcodec/ac3dec.h
--- 2/libavcodec/ac3dec.h
+++ b/libavcodec/ac3dec.h
@@@ -201,13 -199,12 +201,13 @@@ typedef struct 
  ///@}
  
  ///@defgroup arrays aligned arrays
-     DECLARE_ALIGNED(16, int,   fixed_coeffs)[AC3_MAX_CHANNELS][AC3_MAX_COEFS];       ///< fixed-point transform coefficients
-     DECLARE_ALIGNED(16, float, transform_coeffs)[AC3_MAX_CHANNELS][AC3_MAX_COEFS];   ///< transform coefficients
-     DECLARE_ALIGNED(16, float, delay)[AC3_MAX_CHANNELS][AC3_BLOCK_SIZE];             ///< delay - added to the next block
-     DECLARE_ALIGNED(16, float, window)[AC3_BLOCK_SIZE];                              ///< window coefficients
-     DECLARE_ALIGNED(16, float, tmp_output)[AC3_BLOCK_SIZE];                          ///< temporary storage for output before windowing
-     DECLARE_ALIGNED(16, float, output)[AC3_MAX_CHANNELS][AC3_BLOCK_SIZE];            ///< output after imdct transform and windowing
-     DECLARE_ALIGNED(16, uint8_t, input_buffer)[AC3_FRAME_BUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE]; ///< temp buffer to prevent overread
+     DECLARE_ALIGNED(16, int,   fixed_coeffs)[AC3_MAX_CHANNELS][AC3_MAX_COEFS];       ///> fixed-point transform coefficients
+     DECLARE_ALIGNED(32, float, transform_coeffs)[AC3_MAX_CHANNELS][AC3_MAX_COEFS];   ///< transform coefficients
+     DECLARE_ALIGNED(32, float, delay)[AC3_MAX_CHANNELS][AC3_BLOCK_SIZE];             ///< delay - added to the next block
+     DECLARE_ALIGNED(32, float, window)[AC3_BLOCK_SIZE];                              ///< window coefficients
+     DECLARE_ALIGNED(32, float, tmp_output)[AC3_BLOCK_SIZE];                          ///< temporary storage for output before windowing
+     DECLARE_ALIGNED(32, float, output)[AC3_MAX_CHANNELS][AC3_BLOCK_SIZE];            ///< output after imdct transform and windowing
++    DECLARE_ALIGNED(32, uint8_t, input_buffer)[AC3_FRAME_BUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE]; ///< temp buffer to prevent overread
  ///@}
  } AC3DecodeContext;
  

diff --cc libavcodec/ac3enc.c
Simple merge

diff --cc libavcodec/ac3enc_fixed.c
Simple merge

diff --cc libavcodec/atrac1.c
Simple merge

diff --cc libavcodec/atrac3.c
Simple merge

diff --cc libavcodec/avcodec.h
Simple merge

diff --cc libavcodec/binkaudio.c
Simple merge

diff --cc libavcodec/cook.c
Simple merge

diff --cc libavcodec/dca.c
Simple merge

diff --cc libavcodec/dct-test.c
Simple merge

diff --cc libavcodec/error_resilience.c
Simple merge

diff --cc libavcodec/fft.c
Simple merge

diff --cc libavcodec/fft.h
Simple merge

diff --cc libavcodec/h261dec.c
Simple merge

diff --cc libavcodec/h263dec.c
Simple merge

diff --cc libavcodec/h264.c
index 22a5786,264afe5..285dbea
--- 1/libavcodec/h264.c
--- 2/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@@ -3006,10 -2849,10 +3002,7 @@@ static int decode_nal_units(H264Contex
                      ff_vdpau_h264_picture_start(s);
              }
  
 -            s->current_picture_ptr->key_frame |=
 -                    (hx->nal_unit_type == NAL_IDR_SLICE) ||
 -                    (h->sei_recovery_frame_cnt >= 0);
              if(hx->redundant_pic_count==0
- #if FF_API_HURRY_UP
-                && hx->s.hurry_up < 5
- #endif
                 && (avctx->skip_frame < AVDISCARD_NONREF || hx->nal_ref_idc)
                 && (avctx->skip_frame < AVDISCARD_BIDIR  || hx->slice_type_nos!=FF_B_TYPE)
                 && (avctx->skip_frame < AVDISCARD_NONKEY || hx->slice_type_nos==FF_I_TYPE)

diff --cc libavcodec/h264.h
Simple merge

diff --cc libavcodec/imc.c
Simple merge

diff --cc libavcodec/motion_est_template.c
Simple merge

diff --cc libavcodec/mpeg12.c
Simple merge

diff --cc libavcodec/mpegvideo.c
Simple merge

diff --cc libavcodec/mpegvideo.h
Simple merge

diff --cc libavcodec/msmpeg4.c
Simple merge

diff --cc libavcodec/nellymoserenc.c
Simple merge

diff --cc libavcodec/options.c
Simple merge

diff --cc libavcodec/pthread.c
Simple merge

diff --cc libavcodec/qdm2.c
Simple merge

diff --cc libavcodec/rv34.c
Simple merge

diff --cc libavcodec/sh4/qpel.c
Simple merge

diff --cc libavcodec/snow.c
Simple merge

diff --cc libavcodec/svq1dec.c
Simple merge

diff --cc libavcodec/svq3.c
Simple merge

diff --cc libavcodec/utils.c
Simple merge

diff --cc libavcodec/vc1dec.c
Simple merge

diff --cc libavcodec/version.h
Simple merge

diff --cc libavcodec/wma.h
Simple merge

diff --cc libavcodec/wmaprodec.c
Simple merge

diff --cc libavcodec/wmavoice.c
Simple merge

diff --cc libavcodec/x86/fft.c
Simple merge

diff --cc libavcodec/x86/fft.h
Simple merge

diff --cc libavcodec/x86/fft_mmx.asm
Simple merge

diff --cc libavcodec/x86/fft_sse.c
Simple merge

diff --cc libavfilter/avfilter.h
Simple merge

diff --cc libavfilter/vf_scale.c
index 9c3868b,65fe01c..27214a6
--- 1/libavfilter/vf_scale.c
--- 2/libavfilter/vf_scale.c
+++ b/libavfilter/vf_scale.c
@@@ -73,10 -71,9 +73,10 @@@ typedef struct 
      int hsub, vsub;             ///< chroma subsampling
      int slice_y;                ///< top of current output slice
      int input_is_pal;           ///< set to 1 if the input format is paletted
 +    int interlaced;
  
-     char w_expr[256];             ///< width  expression string
-     char h_expr[256];             ///< height expression string
+     char w_expr[256];           ///< width  expression string
+     char h_expr[256];           ///< height expression string
  } ScaleContext;
  
  static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)

diff --cc libavfilter/vf_yadif.c
index 6d88476,42a7219..d608c65
--- 1/libavfilter/vf_yadif.c
--- 2/libavfilter/vf_yadif.c
+++ b/libavfilter/vf_yadif.c
@@@ -1,9 -1,10 +1,8 @@@
  /*
   * Copyright (C) 2006-2010 Michael Niedermayer <michaelni@gmx.at>
-  *               2010 James Darnley <james.darnley@gmail.com>
-  * This file is part of FFmpeg.
+  *               2010      James Darnley <james.darnley@gmail.com>
   *
 - * This file is part of Libav.
 - *
 - * Libav is free software; you can redistribute it and/or modify
 + * FFmpeg is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
   * the Free Software Foundation; either version 2 of the License, or
   * (at your option) any later version.

diff --cc libavfilter/vsrc_buffer.c
Simple merge

diff --cc libavformat/nutenc.c
Simple merge

diff --cc libavutil/avutil.h
Simple merge

diff --cc libavutil/mem.c
Simple merge

diff --cc libavutil/pca.c
Simple merge

diff --cc libavutil/utils.c
index 8a1d32e,9b18c97..c77a060
--- 1/libavutil/utils.c
--- 2/libavutil/utils.c
+++ b/libavutil/utils.c
@@@ -37,5 -37,19 +37,19 @@@ const char *avutil_configuration(void
  const char *avutil_license(void)
  {
  #define LICENSE_PREFIX "libavutil license: "
 -    return LICENSE_PREFIX LIBAV_LICENSE + sizeof(LICENSE_PREFIX) - 1;
 +    return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;
  }
+ 
+ char av_get_picture_type_char(enum AVPictureType pict_type)
+ {
+     switch (pict_type) {
+     case AV_PICTURE_TYPE_I:  return 'I';
+     case AV_PICTURE_TYPE_P:  return 'P';
+     case AV_PICTURE_TYPE_B:  return 'B';
+     case AV_PICTURE_TYPE_S:  return 'S';
+     case AV_PICTURE_TYPE_SI: return 'i';
+     case AV_PICTURE_TYPE_SP: return 'p';
+     case AV_PICTURE_TYPE_BI: return 'b';
+     default:                 return '?';
+     }
+ }