Merge commit '39ec5e1cf8444f827c42effb76e5694e091bbff3'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 4 Jun 2014 18:07:59 +0000 (20:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 4 Jun 2014 18:08:22 +0000 (20:08 +0200)
commit0efe3be71d94a094b2de6ae151309ab875a5463e
treeaab64eb23632de4b1477a47c3fd74fa4bb91db97
parentd76f0c0378dfd86883df28d32fdbc9071e2606ff
parent39ec5e1cf8444f827c42effb76e5694e091bbff3
Merge commit '39ec5e1cf8444f827c42effb76e5694e091bbff3'

* commit '39ec5e1cf8444f827c42effb76e5694e091bbff3':
  avconv: Report the codec and the encoder separately

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