diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-29 14:22:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-29 14:22:58 +0100 |
| commit | 0ecfcf862136d1c7b190415826c0521a52e790fb (patch) | |
| tree | 579a5fd539937536b401345471e40d68870b25f2 /tests/fate/adpcm.mak | |
| parent | 9f8e2e92ae88841709ae1ffe71572ef7e5e865c7 (diff) | |
| parent | e2718e7a7006908d7fb9bb003a92f28d58fa6e21 (diff) | |
| download | ffmpeg-0ecfcf862136d1c7b190415826c0521a52e790fb.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avplay: Do not use removed av_get_int()
avconv: fix variable shadowing in configure_input_audio_filter()
Conflicts:
ffmpeg_filter.c
ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/adpcm.mak')
0 files changed, 0 insertions, 0 deletions