Changeset 81babc43 in ffmpeg

Timestamp:

Jul 9, 2014, 9:11:09 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

73b12830

Parents:

d52f874c (diff), a14b6165 (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> (07/09/14 21:11:01)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (07/09/14 21:11:09)

Message:

Merge commit 'a14b61658c3302081ea5da3ea65b7d9f7b4fb2eb'

• commit 'a14b61658c3302081ea5da3ea65b7d9f7b4fb2eb': mtv: do not set sample_rate for video

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

(No files)