Merge remote branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 29 Apr 2011 23:40:29 +0000 (01:40 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 29 Apr 2011 23:58:26 +0000 (01:58 +0200)
* 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>
23 files changed:
1  2 
ffmpeg.c
libavcodec/asv1.c
libavcodec/dsputil.c
libavcodec/h263dec.c
libavcodec/h264.c
libavcodec/huffyuv.c
libavcodec/motion_est.c
libavcodec/motion_est_template.c
libavcodec/mpeg12enc.c
libavcodec/mpegaudioenc.c
libavcodec/msmpeg4.c
libavcodec/parser.c
libavcodec/ratecontrol.c
libavcodec/sh4/idct_sh4.c
libavcodec/svq1dec.c
libavcodec/vorbis.c
libavcodec/vorbis.h
libavcodec/vorbisdec.c
libavcodec/wmadec.c
libavcodec/wmv2dec.c
libavcodec/x86/mpegvideo_mmx_template.c
libavformat/ffmdec.c
libavformat/mpegts.c

diff --cc ffmpeg.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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
          csub = (1 << cbits) - 1;
          cval = 0;
  
-         AV_DEBUG("Cbits %\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) {
Simple merge
Simple merge
Simple merge
Simple merge