generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'cehoyos/master'

Browse Source 
* cehoyos/master:
  Define ff_log2_run[] in libavcodec/internal.h.
  Replace an incorrect av_free() in movenc.c with av_freep().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-03-11 00:53:20 +01:00
commit 4775424446
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/ffv1.h
View File

@ -54,8 +54,6 @@
#define MAX_QUANT_TABLES 8 #define MAX_QUANT_TABLES 8
#define MAX_CONTEXT_INPUTS 5 #define MAX_CONTEXT_INPUTS 5
extern const uint8_t ff_log2_run[41];
typedef struct VlcState { typedef struct VlcState {
int16_t drift; int16_t drift;
uint16_t error_sum; uint16_t error_sum;

2
libavcodec/internal.h
View File

@ -245,4 +245,6 @@ int ff_set_dimensions(AVCodecContext *s, int width, int height);
int ff_side_data_update_matrix_encoding(AVFrame *frame, int ff_side_data_update_matrix_encoding(AVFrame *frame,
enum AVMatrixEncoding matrix_encoding); enum AVMatrixEncoding matrix_encoding);
extern const uint8_t ff_log2_run[41];
#endif /* AVCODEC_INTERNAL_H */ #endif /* AVCODEC_INTERNAL_H */

3
libavcodec/jpegls.h
View File

@ -30,6 +30,7 @@
#include "libavutil/common.h" #include "libavutil/common.h"
#include "avcodec.h" #include "avcodec.h"
#include "internal.h"
typedef struct JpeglsContext { typedef struct JpeglsContext {
AVCodecContext *avctx; AVCodecContext *avctx;
@ -43,8 +44,6 @@ typedef struct JLSState {
int run_index[4]; int run_index[4];
} JLSState; } JLSState;
extern const uint8_t ff_log2_run[32];
/** /**
* Calculate initial JPEG-LS parameters * Calculate initial JPEG-LS parameters
*/ */

2
libavformat/movenc.c
View File

@ -3598,7 +3598,7 @@ static int mov_create_chapter_track(AVFormatContext *s, int tracknum)
track->enc->extradata = buf; track->enc->extradata = buf;
track->enc->extradata_size = size; track->enc->extradata_size = size;
} else { } else {
av_free(&buf); av_freep(&buf);
} }
} }
#endif #endif