[FFmpeg-cvslog] Merge commit '39ec5e1cf8444f827c42effb76e5694e091bbff3'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jun  4 20:07:59 2014 +0200| [0efe3be71d94a094b2de6ae151309ab875a5463e] | committer: Michael Niedermayer

Merge commit '39ec5e1cf8444f827c42effb76e5694e091bbff3'

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0efe3be71d94a094b2de6ae151309ab875a5463e
---