Changeset 4640da7e in ffmpeg

Timestamp:

Jan 15, 2012, 12:16:54 AM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

d9816cd5

Parents:

a91f2066 (diff), 4cd0bdae (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> (01/15/12 00:07:00)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (01/15/12 00:16:54)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: sgidec: Use bytestream2 functions to prevent buffer overreads. cosmetics: Move static and inline attributes to more standard places. configure: provide libavfilter/version.h header to get_version() swscale: change yuv2yuvX code to use cpuflag(). libx264: Don't leave max_b_frames as -1 if the user didn't set it FATE: convert output to rgba for the targa tests which currently output pal8 fate: add missing reference files for targa tests in 9c2f9b0e2 FATE: enable the 2 remaining targa conformance suite tests targa: add support for rgb555 palette FATE: fix targa tests on big-endian systems

Conflicts:

libavcodec/sgidec.c
libavcodec/targa.c
libswscale/x86/output.asm
tests/fate/image.mak

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

(No files)