Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Oct 2012 11:11:11 +0000 (13:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Oct 2012 11:11:11 +0000 (13:11 +0200)
* qatar/master:
  af_resample: avoid conversion of identical sample formats for 1 channel
  avcodec: allow either planar or interleaved sample format when encoding mono
  adpcmenc: ensure calls to adpcm_ima_compress_sample() are in the right order
  timefilter: De-doxygenize normal code comments and drop silly ones
  gxf: Include the right header for the avpriv_frame_rate_tab declaration

Conflicts:
libavcodec/adpcmenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/adpcmenc.c
libavcodec/utils.c
libavdevice/timefilter.c
libavformat/gxf.c

Simple merge
Simple merge
@@@ -74,12 -66,10 +73,10 @@@ double ff_timefilter_update(TimeFilter 
      } else {
          double loop_error;
          self->cycle_time += self->clock_period * period;
-         /// calculate loop error
          loop_error = system_time - self->cycle_time;
  
-         /// update loop
          self->cycle_time   += FFMAX(self->feedback2_factor, 1.0 / self->count) * loop_error;
 -        self->clock_period += self->feedback3_factor * loop_error / period;
 +        self->clock_period += self->feedback3_factor * loop_error;
      }
      return self->cycle_time;
  }
Simple merge