Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ac3enc: move ff_ac3_encode_frame() to ac3enc_template.c
  ac3enc: merge log2_tab() into normalize_samples()
  ac3enc: Remove bit allocation fallbacks.

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

diff --cc libavcodec/ac3enc.c
Simple merge

diff --cc libavcodec/ac3enc.h
index 490cb2b,be62656..5f5d2c2
--- 1/libavcodec/ac3enc.h
--- 2/libavcodec/ac3enc.h
+++ b/libavcodec/ac3enc.h
@@@ -243,13 -233,28 +233,26 @@@ typedef struct AC3EncodeContext 
  } AC3EncodeContext;
  
  
 -extern const int64_t ff_ac3_channel_layouts[19];
 -
  int ff_ac3_encode_init(AVCodecContext *avctx);
  
- int ff_ac3_encode_frame(AVCodecContext *avctx, unsigned char *frame,
-                         int buf_size, void *data);
- 
  int ff_ac3_encode_close(AVCodecContext *avctx);
  
+ int ff_ac3_validate_metadata(AVCodecContext *avctx);
+ 
+ void ff_ac3_adjust_frame_size(AC3EncodeContext *s);
+ 
+ void ff_ac3_compute_coupling_strategy(AC3EncodeContext *s);
+ 
+ void ff_ac3_apply_rematrixing(AC3EncodeContext *s);
+ 
+ void ff_ac3_process_exponents(AC3EncodeContext *s);
+ 
+ int ff_ac3_compute_bit_allocation(AC3EncodeContext *s);
+ 
+ void ff_ac3_quantize_mantissas(AC3EncodeContext *s);
+ 
+ void ff_ac3_output_frame(AC3EncodeContext *s, unsigned char *frame);
+ 
  
  /* prototypes for functions in ac3enc_fixed.c and ac3enc_float.c */
  

diff --cc libavcodec/ac3enc_fixed.c
Simple merge

diff --cc libavcodec/ac3enc_float.c
Simple merge