Changeset 6a7980e2 in ffmpeg

Timestamp:

Nov 21, 2013, 6:26:01 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

0afa254d

Parents:

c0caf7e8 (diff), ac0e03ba (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.

git-author:

Michael Niedermayer <michaelni@gmx.at> (11/21/13 18:15:28)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/21/13 18:26:01)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: dct/fft: Give consistent names to fixed/float template files

Conflicts:

libavcodec/fft_fixed.c
libavcodec/fft_float.c
libavcodec/mdct_fixed.c
libavcodec/mdct_float.c

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

(No files)