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)
commitaa61ca0c592b6169edf82990078579ada49a3332
tree5eff589b0be2b0e7fb601b4efd0c3670a51dc371
parentf428c29c23931620eafe692bede0773f66fe17e3
parentd3f751e6030545c5e1f312c5a83c1e6ed5794f18
Merge remote-tracking branch 'qatar/master'

* 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:
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