Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 5 May 2012 18:10:45 +0000 (20:10 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 5 May 2012 18:22:09 +0000 (20:22 +0200)
commit517dcc9b5fc4294669c0b6edaaa3ff166d412219
treeafff025f131c22971259fd339a1663191fbb3a20
parent5f4e18cd162be2375cdd623816de58207b0b8a31
parentf0ccd53a3b0bbe704a7bc94dbc8caac7be81e079
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  tests: Refactor rotozoom/videogen common code into a separate file.
  tests: Mark some file-internal symbols as static.
  build: Drop leftover .exp pattern from LIBSUFFIXES list.
  vsrc_buffer: return EAGAIN if no frame is available.
  WMAL: Shift output samples by the specified number of padding zeroes.
  WMAL: Restore removed code in mclms_predict()
  rtpdec_h264: Remove a useless ifdef
  rtpdec_h264: Remove outdated/useless/incorrect comments
  rtpdec_h264: Remove useless memory corruption checks
  rtpdec_h264: Return proper error codes
  rtpdec_h264: Check the available data length before reading
  rtpdec_h264: Add input size checks
  png: check bit depth for PAL8/Y400A pixel formats.
  ea: check chunk_size for validity.
  celp filters: Do not read earlier than the start of the 'out' vector.

Conflicts:
libavcodec/pngdec.c
libavfilter/src_buffer.c
tests/rotozoom.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
common.mak
libavcodec/celp_filters.c
libavcodec/pngdec.c
libavcodec/wmalosslessdec.c
libavformat/electronicarts.c
libavformat/rtpdec_h264.c
tests/Makefile
tests/rotozoom.c
tests/utils.c
tests/videogen.c