diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-07 13:42:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-07 13:42:56 +0100 |
| commit | d5518545d1b6df40d71e43dab8ada97710273db3 (patch) | |
| tree | c23ddf81c2acfd057daca41582ee1404a1695c67 /libavcodec/ituh263dec.c | |
| parent | 60a0bc46cdba5f13d557624d3448628328ad0fb0 (diff) | |
| parent | ca1fe6c0e60808da45d4dfd8728f45e843b9f9b0 (diff) | |
Merge commit 'ca1fe6c0e60808da45d4dfd8728f45e843b9f9b0'
* commit 'ca1fe6c0e60808da45d4dfd8728f45e843b9f9b0':
h263: remove an unused parameter from ff_h263_decode_init_vlc
flac: add channel layout masks for streams with 7 or 8 channels.
flac: don't check the number of channels before setting the channel layout.
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ituh263dec.c')
| -rw-r--r-- | libavcodec/ituh263dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c index ec9a4c4257..1c7e34f317 100644 --- a/libavcodec/ituh263dec.c +++ b/libavcodec/ituh263dec.c @@ -100,7 +100,7 @@ static VLC cbpc_b_vlc; /* init vlcs */ /* XXX: find a better solution to handle static init */ -void ff_h263_decode_init_vlc(MpegEncContext *s) +void ff_h263_decode_init_vlc(void) { static volatile int done = 0; |