[FFmpeg-cvslog] Merge commit '51fc88e7467169031b20b9983d80456b893a9fa3'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug  5 09:32:31 2013 +0200| [783c674da7da4335b75c23809774161e4ac4398d] | committer: Michael Niedermayer

Merge commit '51fc88e7467169031b20b9983d80456b893a9fa3'

* commit '51fc88e7467169031b20b9983d80456b893a9fa3':
  avconv: improve some variable names

Conflicts:
	ffmpeg_filter.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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