Merge remote branch 'qatar/master'

* qatar/master:
Duplicate  AMV: disable DR1 and don't override EMU_EDGE
Duplicate  lavf: inspect more frames for fps when container time base is coarse
Wrong and we have correct fix: Fix races in default av_log handler
  vorbis: Replace sized int_fast integer types with plain int/unsigned.
  Remove disabled non-optimized code variants.
NO  bswap.h: Remove disabled code.
  Remove some disabled printf debug cruft.
  Replace more disabled printf() calls by av_dlog().
NO  tests: Remove disabled code.
NO  Replace some commented-out debug printf() / av_log() messages with av_dlog().
  vorbisdec: Replace some sizeof(type) by sizeof(*variable).
NO  vf_fieldorder: Replace FFmpeg by Libav in license boilerplate.

Conflicts:
	libavcodec/h264.c
	libavcodec/vorbisdec.c
	libavutil/log.c

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

diff --cc ffmpeg.c
Simple merge

diff --cc libavcodec/asv1.c
Simple merge

diff --cc libavcodec/dsputil.c
Simple merge

diff --cc libavcodec/h263dec.c
Simple merge

diff --cc libavcodec/h264.c
Simple merge

diff --cc libavcodec/huffyuv.c
Simple merge

diff --cc libavcodec/motion_est.c
Simple merge

diff --cc libavcodec/motion_est_template.c
Simple merge

diff --cc libavcodec/mpeg12enc.c
Simple merge

diff --cc libavcodec/mpegaudioenc.c
Simple merge

diff --cc libavcodec/msmpeg4.c
Simple merge

diff --cc libavcodec/parser.c
Simple merge

diff --cc libavcodec/ratecontrol.c
Simple merge

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

diff --cc libavcodec/svq1dec.c
Simple merge

diff --cc libavcodec/vorbis.c
Simple merge

diff --cc libavcodec/vorbis.h
Simple merge

diff --cc libavcodec/vorbisdec.c
index a7f83eb,6c912f0..161c54d
--- 1/libavcodec/vorbisdec.c
--- 2/libavcodec/vorbisdec.c
+++ b/libavcodec/vorbisdec.c
@@@ -1138,16 -1148,8 +1150,8 @@@ static int vorbis_floor1_decode(vorbis_
      uint_fast16_t floor1_Y[258];
      uint_fast16_t floor1_Y_final[258];
      int floor1_flag[258];
-     uint_fast8_t partition_class;
-     uint_fast8_t cdim;
-     uint_fast8_t cbits;
-     uint_fast8_t csub;
-     uint_fast8_t cval;
-     int_fast16_t book;
-     uint_fast16_t offset;
-     uint_fast16_t i,j;
-     int_fast16_t adx, ady, dy, off, predicted;
-     int_fast32_t err;
 -    unsigned class, cdim, cbits, csub, cval, offset, i, j;
++    unsigned partition_class, cdim, cbits, csub, cval, offset, i, j;
+     int book, adx, ady, dy, off, predicted, err;
  
  
      if (!get_bits1(gb)) // silence
@@@ -1168,16 -1170,17 +1172,17 @@@
          csub = (1 << cbits) - 1;
          cval = 0;
  
-         AV_DEBUG("Cbits %d \n", cbits);
+         AV_DEBUG("Cbits %u\n", cbits);
  
          if (cbits) // this reads all subclasses for this partition's class
 -            cval = get_vlc2(gb, vc->codebooks[vf->class_masterbook[class]].vlc.table,
 -                            vc->codebooks[vf->class_masterbook[class]].nb_bits, 3);
 +            cval = get_vlc2(gb, vc->codebooks[vf->class_masterbook[partition_class]].vlc.table,
 +                            vc->codebooks[vf->class_masterbook[partition_class]].nb_bits, 3);
  
          for (j = 0; j < cdim; ++j) {
 -            book = vf->subclass_books[class][cval & csub];
 +            book = vf->subclass_books[partition_class][cval & csub];
  
-             AV_DEBUG("book %d Cbits %d cval %d  bits:%d \n", book, cbits, cval, get_bits_count(gb));
+             AV_DEBUG("book %d Cbits %u cval %u  bits:%d\n",
+                      book, cbits, cval, get_bits_count(gb));
  
              cval = cval >> cbits;
              if (book > -1) {

diff --cc libavcodec/wmadec.c
Simple merge

diff --cc libavcodec/wmv2dec.c
Simple merge

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

diff --cc libavformat/ffmdec.c
Simple merge

diff --cc libavformat/mpegts.c
Simple merge