[FFmpeg-cvslog] Merge commit '6656370b858329ca07a60a2de954d5e90daa0206'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May 18 21:26:29 2014 +0200| [1e49439f04f4aeb45344e8753094d00ac4b1a5d6] | committer: Michael Niedermayer

Merge commit '6656370b858329ca07a60a2de954d5e90daa0206'

* commit '6656370b858329ca07a60a2de954d5e90daa0206':
  avconv: set the "encoder" tag when transcoding

Conflicts:
	ffmpeg.c
	tests/ref/lavf/mkv
	tests/ref/seek/lavf-mkv

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

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