Changeset 525a7d9b in ffmpeg

Timestamp:

Dec 11, 2013, 11:19:53 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

e3578fd5

Parents:

0506cc2c (diff), 48d17ee6 (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> (12/11/13 23:19:49)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (12/11/13 23:19:53)

Message:

Merge commit '48d17ee6dc2b2a552f645484f200c2946bf24607'

• commit '48d17ee6dc2b2a552f645484f200c2946bf24607': api-example: remove an unneeded call to avcodec_get_frame_defaults().

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

(No files)