diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 00:53:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 00:53:24 +0100 |
| commit | 47754244463cff8873798da774605c7bf8bd763a (patch) | |
| tree | 154c03edbfcb03e00d4701e549a1616c482ca5cd | |
| parent | 4da8dc64be50cd814b4dab75693207dc73bca47a (diff) | |
| parent | 5968415156007de5e154c6af826ab16b7373892a (diff) | |
| download | ffmpeg-47754244463cff8873798da774605c7bf8bd763a.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* 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>
| -rw-r--r-- | libavcodec/ffv1.h | 2 | ||||
| -rw-r--r-- | libavcodec/internal.h | 2 | ||||
| -rw-r--r-- | libavcodec/jpegls.h | 3 | ||||
| -rw-r--r-- | libavformat/movenc.c | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/libavcodec/ffv1.h b/libavcodec/ffv1.h index 9d8329f00f..ba98845e0b 100644 --- a/libavcodec/ffv1.h +++ b/libavcodec/ffv1.h @@ -54,8 +54,6 @@ #define MAX_QUANT_TABLES 8 #define MAX_CONTEXT_INPUTS 5 -extern const uint8_t ff_log2_run[41]; - typedef struct VlcState { int16_t drift; uint16_t error_sum; diff --git a/libavcodec/internal.h b/libavcodec/internal.h index 8aa0ac101c..6d3cdcdaaa 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -245,4 +245,6 @@ int ff_set_dimensions(AVCodecContext *s, int width, int height); int ff_side_data_update_matrix_encoding(AVFrame *frame, enum AVMatrixEncoding matrix_encoding); +extern const uint8_t ff_log2_run[41]; + #endif /* AVCODEC_INTERNAL_H */ diff --git a/libavcodec/jpegls.h b/libavcodec/jpegls.h index 10ae054a7b..c8997c7861 100644 --- a/libavcodec/jpegls.h +++ b/libavcodec/jpegls.h @@ -30,6 +30,7 @@ #include "libavutil/common.h" #include "avcodec.h" +#include "internal.h" typedef struct JpeglsContext { AVCodecContext *avctx; @@ -43,8 +44,6 @@ typedef struct JLSState { int run_index[4]; } JLSState; -extern const uint8_t ff_log2_run[32]; - /** * Calculate initial JPEG-LS parameters */ diff --git a/libavformat/movenc.c b/libavformat/movenc.c index b917a59fb5..e21c32a30b 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -3598,7 +3598,7 @@ static int mov_create_chapter_track(AVFormatContext *s, int tracknum) track->enc->extradata = buf; track->enc->extradata_size = size; } else { - av_free(&buf); + av_freep(&buf); } } #endif |