diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-07 02:17:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-07 02:17:30 +0200 |
| commit | 46a47077eee2d7755e17f6557903f383cdfe1b8b (patch) | |
| tree | 2f42fe2b5bcd4f3e71a24bc9126ce73ecc665a74 /libavcodec/mss3.c | |
| parent | a6da14ec3cbe009b2f6fe3eaaa4865e8c8f5ef1a (diff) | |
| parent | 5adc829eb0787682111ca063bfc2b31558999dff (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: add functions for testing code fragments
af_amix: avoid spurious EAGAIN.
af_amix: return AVERROR(EAGAIN) when request_frame didn't produce output.
af_amix: only consider negative return codes as errors.
avconv: use only meaningful timestamps in start time check.
avconv: fix the check for -ss as an output option.
mss3: add forgotten 'static' qualifier for private table
lavc: options: add planar names for request_sample_fmt
flacdec: add planar output support
flvdec: Treat all nellymoser versions as the same codec
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mss3.c')
| -rw-r--r-- | libavcodec/mss3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mss3.c b/libavcodec/mss3.c index 4f33984e06..649b7ca918 100644 --- a/libavcodec/mss3.c +++ b/libavcodec/mss3.c @@ -141,7 +141,7 @@ static const uint8_t mss3_chroma_quant[64] = { 99, 99, 99, 99, 99, 99, 99, 99 }; -const uint8_t zigzag_scan[64] = { +static const uint8_t zigzag_scan[64] = { 0, 1, 8, 16, 9, 2, 3, 10, 17, 24, 32, 25, 18, 11, 4, 5, 12, 19, 26, 33, 40, 48, 41, 34, |