Changeset 5a153604 in ffmpeg

Timestamp:

May 15, 2011, 2:44:07 AM (14 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

10931720, d46aada5

Parents:

2c4ad1a3 (diff), 888fa31e (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> (05/15/11 02:40:50)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (05/15/11 02:44:07)

Message:

Merge remote branch 'qatar/master'

• qatar/master: Fix FSF address copy paste error in some license headers. Add an aac sample which uses LTP to fate-aac.

DUPLICATE [PATCH] Update pixdesc_be fate refs after adding 9/10bit YUV420P formats.

arm: properly mark external symbol call

Conflicts:

libavcodec/x86/ac3dsp.asm
libavcodec/x86/deinterlace.asm
libavcodec/x86/dsputil_yasm.asm
libavcodec/x86/dsputilenc_yasm.asm
libavcodec/x86/fft_mmx.asm
libavcodec/x86/fmtconvert.asm
libavcodec/x86/h264_chromamc.asm
libavcodec/x86/h264_deblock.asm
libavcodec/x86/h264_idct.asm
libavcodec/x86/h264_intrapred.asm
libavcodec/x86/h264_weight.asm
libavcodec/x86/vc1dsp_yasm.asm
libavcodec/x86/vp3dsp.asm
libavcodec/x86/vp56dsp.asm
libavcodec/x86/vp8dsp.asm
libavcodec/x86/x86util.asm
libswscale/ppc/swscale_template.c

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

(No files)