Changeset 68c05185 in ffmpeg

Timestamp:

May 18, 2014, 11:00:50 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

6a510909

Parents:

ff17d8b5 (diff), fd056029 (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.

Message:

Merge commit 'fd056029f45a9f6d213d9fce8165632042511d4f'

• commit 'fd056029f45a9f6d213d9fce8165632042511d4f': lavc: add avcodec_free_context().

Conflicts:

doc/APIchanges
libavcodec/version.h

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

(No files)