Changeset 3bd43430 in ffmpeg

Timestamp:

May 31, 2015, 10:37:06 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

ebab902

Parents:

2bedd17b (diff), cffb9ea8 (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/31/15 22:36:36)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (05/31/15 22:37:06)

Message:

Merge commit 'cffb9ea81bd16d2ed8bce187b6bf0279c07b3b9b'

• commit 'cffb9ea81bd16d2ed8bce187b6bf0279c07b3b9b': mov: reject zero bytes_per_frame with non-zero samples_per_frame

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

(No files)