Michael Niedermayer 0ecfcf8621 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>

2012-11-29 14:22:58 +01:00

112 KiB

Raw Blame History

View Raw