Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 28 Mar 2012 02:12:24 +0000 (04:12 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 28 Mar 2012 02:12:24 +0000 (04:12 +0200)
commit7b453d1c60005cd1e0461a8d06d07e89116772d4
tree55f5b363a0f6b5f447026edb8e80b38ef8c22437
parent4a619fcae99c7fc8cae7070c7859243c40cdb4bc
parent55abaa58e5ede59d497e1ab89d5fe0950d1c6ecf
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  westwood_vqa: fix SND0 chunk handling
  westwood_vqa: set video stream duration
  raw: forward avpicture_fill() error code in raw_decode().
  build: Do not explicitly add the doc directory to the OBJDIRS list.
  dv: Split off DV video decoder into its own file.
  build: fix RALF decoder standalone compilation, which depends on Golomb code
  configure: Drop stray duplicate entry for --disable-fft from help output.

Conflicts:
libavcodec/dv.c
libavcodec/rawdec.c
libavformat/westwood_vqa.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
doc/Makefile
libavcodec/Makefile
libavcodec/dv.c
libavcodec/dv_tablegen.h
libavcodec/dvdata.h
libavcodec/dvdec.c
libavcodec/rawdec.c