Changeset b3970b3 in ffmpeg

Timestamp:

Sep 16, 2013, 12:10:31 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

7283d2bb

Parents:

e0fcd029 (diff), 6fc8226e (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> (09/16/13 12:06:28)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (09/16/13 12:10:31)

Message:

Merge commit '6fc8226e29055858f28973bb3d27b63b3b65e616'

• commit '6fc8226e29055858f28973bb3d27b63b3b65e616': vp3: Check the framerate for validity

Conflicts:

libavcodec/vp3.c

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

(No files)