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 | |
| parent | 60a0bc46cdba5f13d557624d3448628328ad0fb0 (diff) | |
| parent | ca1fe6c0e60808da45d4dfd8728f45e843b9f9b0 (diff) | |
| download | ffmpeg-d5518545d1b6df40d71e43dab8ada97710273db3.tar.gz | |
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>
| -rw-r--r-- | libavcodec/h263.h | 2 | ||||
| -rw-r--r-- | libavcodec/h263dec.c | 2 | ||||
| -rw-r--r-- | libavcodec/ituh263dec.c | 2 | ||||
| -rw-r--r-- | libavcodec/rv10.c | 2 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/h263.h b/libavcodec/h263.h index 3cb06f387a..28d59ecc39 100644 --- a/libavcodec/h263.h +++ b/libavcodec/h263.h @@ -80,7 +80,7 @@ void ff_h263_encode_gob_header(MpegEncContext * s, int mb_line); int16_t *ff_h263_pred_motion(MpegEncContext * s, int block, int dir, int *px, int *py); void ff_h263_encode_init(MpegEncContext *s); -void ff_h263_decode_init_vlc(MpegEncContext *s); +void ff_h263_decode_init_vlc(void); int ff_h263_decode_picture_header(MpegEncContext *s); int ff_h263_decode_gob_header(MpegEncContext *s); void ff_h263_update_motion_val(MpegEncContext * s); diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 71dc948784..d5dc152623 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -121,7 +121,7 @@ av_cold int ff_h263_decode_init(AVCodecContext *avctx) if ((ret = ff_MPV_common_init(s)) < 0) return ret; - ff_h263_decode_init_vlc(s); + ff_h263_decode_init_vlc(); return 0; } 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; diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index 2334fd1f12..06b1606efb 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -505,7 +505,7 @@ static av_cold int rv10_decode_init(AVCodecContext *avctx) if (ff_MPV_common_init(s) < 0) return -1; - ff_h263_decode_init_vlc(s); + ff_h263_decode_init_vlc(); /* init rv vlc */ if (!done) { diff --git a/libavcodec/version.h b/libavcodec/version.h index 01ce0eaab8..0844754db2 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #define LIBAVCODEC_VERSION_MAJOR 54 #define LIBAVCODEC_VERSION_MINOR 91 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MICRO 102 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |