Changeset f67ec7f3 in ffmpeg

Timestamp:

Nov 24, 2013, 4:12:07 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

ccdfa3e

Parents:

ceaaf0d9 (diff), 0eeeb964 (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 '0eeeb9647e9c92c9edfd0b18c7cb5da7ac666f85'

• commit '0eeeb9647e9c92c9edfd0b18c7cb5da7ac666f85': mpegaudiodec: Consistently handle fixed/float templating

Conflicts:

libavcodec/Makefile

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

(No files)