* 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@gmx.at>