Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 31 Dec 2011 00:16:45 +0000 (01:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 31 Dec 2011 00:16:45 +0000 (01:16 +0100)
commit1a6a088f7c7b164042ad16d43d05543ce1bacfa4
treead29c28f8c42f776f85a65cef87ed625c1a302e2
parente146ad95d79b1a6e6b9e566366b832825c79679f
parent9afc025bff4e3a517105a69ec5009ac66b38f483
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: whitespace cosmetics
  fate: split off video codec FATE tests into their own file
  fate: split off audio codec FATE tests into their own file
  fate: split off Electronic Arts codec FATE tests into their own file
  fate: split off QuickTime codec FATE tests into their own file
  fate: split off voice codec FATE tests into their own file
  fate: split off demuxer FATE tests into their own file
  cosmetics: Drop unnecessary parentheses around return values.
  fate: drop pointless _audio and _video suffixes from xan tests
  qt-faststart: K&R reformatting; fix comment typos
  FATE: Add test for H.264 MP4->annex.B bitstream filter.

Conflicts:
ffplay.c
tests/fate.mak
tests/fate/h264.mak
tests/fate/image.mak
tests/fate/lossless-audio.mak
tests/fate/lossless-video.mak
tests/fate/qtrle.mak
tests/fate/real.mak
tests/fate/screen.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
18 files changed:
cmdutils.c
libavcodec/atrac3.c
libavcodec/dv.c
libavcodec/ivi_common.h
libavcodec/libvorbis.c
libavcodec/ra144enc.c
libavcodec/vaapi_mpeg2.c
libavcodec/vaapi_vc1.c
libavfilter/vf_drawtext.c
tests/Makefile
tests/fate/h264.mak
tests/fate/image.mak
tests/fate/lossless-audio.mak
tests/fate/lossless-video.mak
tests/fate/qtrle.mak
tests/fate/real.mak
tests/fate/screen.mak
tools/qt-faststart.c