Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Nov 2012 13:22:58 +0000 (14:22 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Nov 2012 13:22:58 +0000 (14:22 +0100)
commit0ecfcf862136d1c7b190415826c0521a52e790fb
tree579a5fd539937536b401345471e40d68870b25f2
parent9f8e2e92ae88841709ae1ffe71572ef7e5e865c7
parente2718e7a7006908d7fb9bb003a92f28d58fa6e21
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>
ffplay.c