Changeset a4a2e894 in ffmpeg

Timestamp:

Jun 16, 2013, 10:21:22 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

85a3d20d

Parents:

1f87cbe8 (diff), 985f34b7 (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 '985f34b75653d02eda8eb8def3412f8577f19b01'

• commit '985f34b75653d02eda8eb8def3412f8577f19b01': utils: fix avcodec_flush_buffers pre-reference counting compatibility

Conflicts:

libavcodec/utils.c

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

(No files)