Merge commit '67f2a688143b644f99360565a9f36c61a5f052e9'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Feb 2014 20:08:19 +0000 (21:08 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Feb 2014 20:08:19 +0000 (21:08 +0100)
commit70a25587d22384bca8f102d68f5b65ebf3e421b2
treeb34513c1054c23c3fa0a3bd80804fcd90bf8dfc7
parente66247e926aa270f087a66085b27c4636e8cf57c
parent67f2a688143b644f99360565a9f36c61a5f052e9
Merge commit '67f2a688143b644f99360565a9f36c61a5f052e9'

* commit '67f2a688143b644f99360565a9f36c61a5f052e9':
  avconv: remove a write-only variable

Conflicts:
ffmpeg.c
ffmpeg.h

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