Changeset 989fb05f in ffmpeg

Timestamp:

Apr 25, 2011, 12:29:09 AM (14 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

2ebd4784, f27ac6d8

Parents:

2671ab39 (diff), 2441003d (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 remote branch 'qatar/master'

• qatar/master: vorbisdec: Employ proper printf format specifiers for uint_fast32_t. applehttp: Don't export variant_bitrate if it isn't known crypto: Use av_freep instead of av_free configure: Add missing libm library dependencies to .pc files. oggdec: reindent after 8f3eebd6 configure: Add missing libavutil inter-library dependencies to .pc files.

Conflicts:

configure

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

(No files)