diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-15 01:07:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-15 01:16:54 +0100 |
| commit | 4640da7e58509996ff03b1a0b018ca8f337391c7 (patch) | |
| tree | 732195f8bc4987e4974df716789044c7e3db0836 /libswscale/utils.c | |
| parent | a91f2066651416e0f9315e7fb0132587352c75dc (diff) | |
| parent | 4cd0bdae9a62d1f0366e60603222762af31e5289 (diff) | |
| download | ffmpeg-4640da7e58509996ff03b1a0b018ca8f337391c7.tar.gz | |
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>
Diffstat (limited to 'libswscale/utils.c')
| -rw-r--r-- | libswscale/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libswscale/utils.c b/libswscale/utils.c index 13eb07512e..46ebb7f647 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -72,7 +72,7 @@ typedef struct FormatEntry { int is_supported_in, is_supported_out; } FormatEntry; -const static FormatEntry format_entries[PIX_FMT_NB] = { +static const FormatEntry format_entries[PIX_FMT_NB] = { [PIX_FMT_YUV420P] = { 1 , 1 }, [PIX_FMT_YUYV422] = { 1 , 1 }, [PIX_FMT_RGB24] = { 1 , 1 }, |