* commit '6deae8e0':
  FATE: remove the -dct option from some decoding tests.
  avconv: use a local variable for InputFile in open_input_file().

Conflicts:
	tests/fate/microsoft.mak
	tests/fate/real.mak
	tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>