Changeset 439c9760 in ffmpeg

Timestamp:

Jul 20, 2015, 8:36:22 PM (9 years ago)

Author:

Michael Niedermayer <michael@niedermayer.cc>

Branches:

master

Children:

b1fad7ac

Parents:

5cc3faf6 (diff), 91f9b657 (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 <michael@niedermayer.cc> (07/20/15 20:36:18)

git-committer:

Michael Niedermayer <michael@niedermayer.cc> (07/20/15 20:36:22)

Message:

Merge commit '91f9b6579ac684c4b51c4cd0dbaed0a4f8295edf'

• commit '91f9b6579ac684c4b51c4cd0dbaed0a4f8295edf': flashsvenc: Keep coded_frame.key_frame a write-only variable

Merged-by: Michael Niedermayer <​michael@niedermayer.cc>

(No files)