Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 25 Sep 2011 21:30:25 +0000 (23:30 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 25 Sep 2011 21:30:25 +0000 (23:30 +0200)
commit537a9e5cc28fe55deedc30953737cff124ac570f
tree3ebcc12011b67905d09f439dc85421cb1834927c
parent508e47a5751b063e5b3d1d6aceda8a19ad8b1d37
parentd853e571ad5e7e12c6a68cfde390daced7d85fbb
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ppc: fix some pointer to integer casts
  ppc: fix 32-bit PIC build
  vmdaudio: fix decoding of 16-bit audio format.
  lavf: do not set codec_tag for rawvideo
  h264: check for out of bounds reads in ff_h264_decode_extradata().
  flvdec: Check for overflow before allocating arrays
  avconv: use correct output stream index when checking max_frames
  avconv: remove fake coded_frame on streamcopy hack

Conflicts:
avconv.c
libavcodec/h264.c
libavcodec/ppc/asm.S
libavcodec/vmdav.c
libavformat/flvdec.c
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
avconv.c
ffmpeg.c
libavcodec/ppc/asm.S
libavcodec/ppc/fft_altivec_s.S
libavcodec/vmdav.c
libswscale/ppc/swscale_altivec.c