FFmpeg/tests/ref
Michael Niedermayer 6086a4d74d Merge commit '747fbe0c21' into release/1.1
* commit '747fbe0c21':
  roqvideodec: fix a potential infinite loop in roqvideo_decode_frame().
  mp3dec: Fix VBR bit rate parsing
  wmaprodec: return an error, not 0, when the input is too small.
  vmdaudio: fix invalid reads when packet size is not a multiple of chunk size
  h264: check for luma and chroma bit dept being equal
  Prepare for 9.4 Release

Conflicts:
	RELEASE
	libavcodec/vmdav.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-14 02:49:31 +01:00
..
acodec lswr: Improve default resampler's default parameters 2013-01-04 16:47:57 +01:00
fate Merge remote-tracking branch 'qatar/release/9' into release/1.1 2013-02-14 13:50:08 +01:00
lavf movenc: hotfix, dont store fiel for h264 / mpeg4-asp / dnxhd 2013-02-18 18:22:04 +01:00
lavf-fate Merge commit '747fbe0c21' into release/1.1 2013-03-14 02:49:31 +01:00
lavfi lavfi/kerndeint: fix temp buffer linesize. 2013-01-06 18:59:15 +01:00
seek movenc: hotfix, dont store fiel for h264 / mpeg4-asp / dnxhd 2013-02-18 18:22:04 +01:00
vsynth movenc: hotfix, dont store fiel for h264 / mpeg4-asp / dnxhd 2013-02-18 18:22:04 +01:00
vsynth1 Merge commit 'f919cc7df6' 2012-05-30 01:40:54 +02:00
vsynth2 Merge commit 'f919cc7df6' 2012-05-30 01:40:54 +02:00