Merge commit '6656370b'
* commit '6656370b': 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>
Showing
Please
register
or
sign in
to comment