Changeset 1e49439f in ffmpeg

Timestamp:

May 18, 2014, 7:31:51 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

bbee02ed

Parents:

c01bcce4 (diff), 6656370b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (05/18/14 19:26:29)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (05/18/14 19:31:51)

Message:

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

(No files)