Merge commit '51fc88e7467169031b20b9983d80456b893a9fa3'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 5 Aug 2013 07:32:31 +0000 (09:32 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 5 Aug 2013 07:32:31 +0000 (09:32 +0200)
commit783c674da7da4335b75c23809774161e4ac4398d
tree47ed28d389e2beb158357ddacc450dea94b8b31c
parent46b3dbf9ca1b65d909a27e01c7b6742d41688ce2
parent51fc88e7467169031b20b9983d80456b893a9fa3
Merge commit '51fc88e7467169031b20b9983d80456b893a9fa3'

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

Conflicts:
ffmpeg_filter.c

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