Merge commit 'ddc589ce98c2bba1e59318b5b0224717325eac46'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Oct 2013 09:46:36 +0000 (10:46 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Oct 2013 09:46:47 +0000 (10:46 +0100)
commited49e91fd70498ef543d837a3ecbd5af376ecffa
treee6990bc5269b11c48ce33df95e18ff70f32353ef
parenta21839149cddf2fa6d4cfc37d066cdb68a2ac8aa
parentddc589ce98c2bba1e59318b5b0224717325eac46
Merge commit 'ddc589ce98c2bba1e59318b5b0224717325eac46'

* commit 'ddc589ce98c2bba1e59318b5b0224717325eac46':
  avconv: drop a now useless variable

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