Changeset 45ba9d85 in ffmpeg

Timestamp:

Apr 2, 2014, 12:54:09 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

61b3b331

Parents:

119cf2a4 (diff), cba4e606 (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 'cba4e6062a02d5bf684e13a770be88aa1fec717e'

• commit 'cba4e6062a02d5bf684e13a770be88aa1fec717e': More correct printf format specifiers

Conflicts:

libavcodec/h264_ps.c
libavcodec/h264_refs.c

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

(No files)