falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

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>
tags/n1.2
Michael Niedermayer 12 years ago
parent
60a0bc46cd ca1fe6c0e6
commit
d5518545d1
5 changed files with 5 additions and 5 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      libavcodec/h263.h
  2. +1
    -1
      libavcodec/h263dec.c
  3. +1
    -1
      libavcodec/ituh263dec.c
  4. +1
    -1
      libavcodec/rv10.c
  5. +1
    -1
      libavcodec/version.h

+ 1
- 1
libavcodec/h263.h View File

@@ -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, int16_t *ff_h263_pred_motion(MpegEncContext * s, int block, int dir,
int *px, int *py); int *px, int *py);
void ff_h263_encode_init(MpegEncContext *s); 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_picture_header(MpegEncContext *s);
int ff_h263_decode_gob_header(MpegEncContext *s); int ff_h263_decode_gob_header(MpegEncContext *s);
void ff_h263_update_motion_val(MpegEncContext * s); void ff_h263_update_motion_val(MpegEncContext * s);


+ 1
- 1
libavcodec/h263dec.c View File

@@ -121,7 +121,7 @@ av_cold int ff_h263_decode_init(AVCodecContext *avctx)
if ((ret = ff_MPV_common_init(s)) < 0) if ((ret = ff_MPV_common_init(s)) < 0)
return ret; return ret;


ff_h263_decode_init_vlc(s);
ff_h263_decode_init_vlc();


return 0; return 0;
} }


+ 1
- 1
libavcodec/ituh263dec.c View File

@@ -100,7 +100,7 @@ static VLC cbpc_b_vlc;
/* init vlcs */ /* init vlcs */


/* XXX: find a better solution to handle static init */ /* 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; static volatile int done = 0;




+ 1
- 1
libavcodec/rv10.c View File

@@ -505,7 +505,7 @@ static av_cold int rv10_decode_init(AVCodecContext *avctx)
if (ff_MPV_common_init(s) < 0) if (ff_MPV_common_init(s) < 0)
return -1; return -1;


ff_h263_decode_init_vlc(s);
ff_h263_decode_init_vlc();


/* init rv vlc */ /* init rv vlc */
if (!done) { if (!done) {


+ 1
- 1
libavcodec/version.h View File

@@ -30,7 +30,7 @@


#define LIBAVCODEC_VERSION_MAJOR 54 #define LIBAVCODEC_VERSION_MAJOR 54
#define LIBAVCODEC_VERSION_MINOR 91 #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, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \ LIBAVCODEC_VERSION_MINOR, \


Write Preview
Loading…
Cancel
Save