Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 5 Jul 2011 22:56:41 +0000 (00:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 5 Jul 2011 23:34:08 +0000 (01:34 +0200)
* qatar/master:
  Add some missing mathematics.h #includes for av_rescale().
  opencore-amr: Add missing initializer braces to shut up gcc warning.
  ARM: workaround for bug in GNU assembler
  dv: fix comment wording mistake
  Rename libavcodec/high_bit_depth.h ---> libavcodec/bit_depth_template.c
  dv: fix valgrind use of uninitialised value warnings.
  mxfenc: fix ignored drop flag in binary timecode representation.
  PPC: use Altivec IMDCT only for supported sizes
  dv: fix comment spelling
  configure: simplify -rpath-link linker flag

Merged-by: Michael Niedermayer <michaelni@gmx.at>
13 files changed:
1  2 
configure
libavcodec/arm/fft_fixed_neon.S
libavcodec/dsputil_template.c
libavcodec/h264dsp_template.c
libavcodec/h264idct_template.c
libavcodec/h264pred_template.c
libavcodec/libopencore-amr.c
libavcodec/ppc/fft_altivec.c
libavdevice/libdc1394.c
libavfilter/vf_frei0r.c
libavformat/flvdec.c
libavformat/librtmp.c
libavformat/mpegts.c

diff --cc configure
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
   */
  
  #include "config.h"
 -#include "libavformat/avformat.h"
  #include "libavutil/log.h"
+ #include "libavutil/mathematics.h"
  #include "libavutil/opt.h"
 +#include "avdevice.h"
 +
 +#include <stdlib.h>
 +#include <string.h>
  #include "libavutil/parseutils.h"
  #include "libavutil/pixdesc.h"
  
Simple merge
Simple merge
Simple merge
Simple merge