From d68ac92dc2ae0e66860d90d18835d27bd7d2aa28 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos@ag.or.at>
Date: Mon, 10 Mar 2014 13:30:51 +0100
Subject: [PATCH 1/2] Replace an incorrect av_free() in movenc.c with
 av_freep().

---
 libavformat/movenc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From 5968415156007de5e154c6af826ab16b7373892a Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos@ag.or.at>
Date: Mon, 10 Mar 2014 13:37:12 +0100
Subject: [PATCH 2/2] Define ff_log2_run[] in libavcodec/internal.h.

This avoids defining the array with different sizes in
different source files.
---
 libavcodec/ffv1.h     | 2 --
 libavcodec/internal.h | 2 ++
 libavcodec/jpegls.h   | 3 +--
 3 files changed, 3 insertions(+), 4 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
  */