[FFmpeg-cvslog] Merge commit '6deae8e0530a885b76f149841ed4899cb438ec23'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 12 21:06:30 2013 +0100| [771919e11fcdf6fb518c04d55b83fb3e50c35a58] | committer: Michael Niedermayer

Merge commit '6deae8e0530a885b76f149841ed4899cb438ec23'

* commit '6deae8e0530a885b76f149841ed4899cb438ec23':
  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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=771919e11fcdf6fb518c04d55b83fb3e50c35a58
---