Merge commit 'ec444c84cfd30ef34a4e7b4ec7ee77d7e5250d25'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 23 Oct 2012 13:08:55 +0000 (15:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 23 Oct 2012 13:08:55 +0000 (15:08 +0200)
commit79ec524ff52aa641896f755b63e933ab2877763c
treed3750e2e5d798ea76e4673263cdfd05a93c3f3b4
parent35ce42e07029b3af62f652a53719fee99bb7a5aa
parentec444c84cfd30ef34a4e7b4ec7ee77d7e5250d25
Merge commit 'ec444c84cfd30ef34a4e7b4ec7ee77d7e5250d25'

* commit 'ec444c84cfd30ef34a4e7b4ec7ee77d7e5250d25':
  mpegaudiodec: Fix buffer handling on random access
  mpegaudio: Refactor mp3on4 flush function
  fate: Add dependencies for audio tests
  fate: cosmetics: Group idct8x8 test together with all other libavcodec tests
  fate: More fine-grained dependencies for libavcodec test programs

Conflicts:
tests/fate/audio.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpegaudiodec.c
tests/Makefile
tests/fate/audio.mak