Merge commit '01947f07b81a57fb1e15114b710f6d5ae4f70a11'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 5 May 2014 13:09:46 +0000 (15:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 5 May 2014 13:09:55 +0000 (15:09 +0200)
commit22ffa5390f6b4bb99fc6cd1fb0f629f6c3a9ba8d
treeac271edc3a53d815728c2ca5b287d508442ba6c3
parent1efc08921868c882427444e2beb9832e221b24cd
parent01947f07b81a57fb1e15114b710f6d5ae4f70a11
Merge commit '01947f07b81a57fb1e15114b710f6d5ae4f70a11'

* commit '01947f07b81a57fb1e15114b710f6d5ae4f70a11':
  avconv: remove a useless line

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