Changeset 44967ab6 in ffmpeg

Timestamp:

Dec 11, 2013, 11:32:15 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

3efe5e3b

Parents:

e3578fd5 (diff), d7b3ee9a (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 'd7b3ee9a3a03ab88d61a5895fbdbc6689f4dd671'

• commit 'd7b3ee9a3a03ab88d61a5895fbdbc6689f4dd671': lavc: deprecate avcodec_get_frame_defaults().

Conflicts:

libavcodec/version.h

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

(No files)