Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ppc: remove redundant setting of Altivec IDCT
  mpegvideo: initialise DSPContext in ff_dct_common_init()
  cosmetics: reindent
  eac3enc: support writing of basic mixing and info metadata
  dnxhdenc: fix declarations in for loops
  dsputil: remove stale bink prototypes and comments
  dsputil: move a bink-only function to binkdsp
  dsputil: remove some unused functions
  bink: make IDCT take 32-bit input

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

diff --cc libavcodec/Makefile
Simple merge

diff --cc libavcodec/ac3.h
index 8e8482f,9adad93..94d6652
--- 1/libavcodec/ac3.h
--- 2/libavcodec/ac3.h
+++ b/libavcodec/ac3.h
@@@ -131,47 -129,8 +131,49 @@@ typedef enum 
      EAC3_FRAME_TYPE_RESERVED
  } EAC3FrameType;
  
 +/**
 + * Encoding Options used by AVOption.
 + */
 +typedef struct AC3EncOptions {
 +    /* AC-3 metadata options*/
 +    int dialogue_level;
 +    int bitstream_mode;
 +    float center_mix_level;
 +    float surround_mix_level;
 +    int dolby_surround_mode;
 +    int audio_production_info;
 +    int mixing_level;
 +    int room_type;
 +    int copyright;
 +    int original;
 +    int extended_bsi_1;
 +    int preferred_stereo_downmix;
 +    float ltrt_center_mix_level;
 +    float ltrt_surround_mix_level;
 +    float loro_center_mix_level;
 +    float loro_surround_mix_level;
 +    int extended_bsi_2;
 +    int dolby_surround_ex_mode;
 +    int dolby_headphone_mode;
 +    int ad_converter_type;
++    int eac3_mixing_metadata;
++    int eac3_info_metadata;
 +
 +    /* other encoding options */
 +    int allow_per_frame_metadata;
 +    int stereo_rematrixing;
 +    int channel_coupling;
 +    int cpl_start;    
 +} AC3EncOptions;
 +
  void ff_ac3_common_init(void);
  
 +extern const int64_t ff_ac3_channel_layouts[];
 +extern const AVOption ff_ac3_options[];
 +
 +extern AVCodec ff_ac3_float_encoder;
 +extern AVCodec ff_ac3_fixed_encoder;
 +
  /**
   * Calculate the log power-spectral density of the input signal.
   * This gives a rough estimate of signal power in the frequency domain by using

diff --cc libavcodec/ac3enc.c
Simple merge

diff --cc libavcodec/ac3enc.h
Simple merge

diff --cc libavcodec/arm/dsputil_init_neon.c
Simple merge

diff --cc libavcodec/arm/dsputil_neon.S
Simple merge

diff --cc libavcodec/bink.c
Simple merge

diff --cc libavcodec/binkdata.h
Simple merge

diff --cc libavcodec/binkdsp.c
index ddb6cc1,1f7855b..c751743
--- 1/libavcodec/binkidct.c
--- 2/libavcodec/binkdsp.c
+++ b/libavcodec/binkdsp.c
@@@ -1,10 -1,10 +1,10 @@@
  /*
-  * Bink IDCT algorithm
+  * Bink DSP routines
   * Copyright (c) 2009 Kostya Shishkov
   *
 - * This file is part of Libav.
 + * This file is part of FFmpeg.
   *
 - * Libav is free software; you can redistribute it and/or
 + * FFmpeg is free software; you can redistribute it and/or
   * modify it under the terms of the GNU Lesser General Public
   * License as published by the Free Software Foundation; either
   * version 2.1 of the License, or (at your option) any later version.

diff --cc libavcodec/dnxhdenc.c
Simple merge

diff --cc libavcodec/dsputil.c
Simple merge

diff --cc libavcodec/dsputil.h
Simple merge

diff --cc libavcodec/mpegvideo.c
Simple merge

diff --cc libavcodec/ppc/mpegvideo_altivec.c
Simple merge