Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / internal.h

diff --git a/libavcodec/internal.h b/libavcodec/internal.h
index 68f49b5f1e84704d88f26091d9a5496558c2d377..13deb871203efe41a0c67de82570aaf469eb5d2e 100644 (file)
--- a/libavcodec/internal.h
+++ b/libavcodec/internal.h
@@ -25,8 +25,44 @@
 #define AVCODEC_INTERNAL_H
 
 #include <stdint.h>
+
+#include "libavutil/pixfmt.h"
 #include "avcodec.h"
 
+typedef struct InternalBuffer {
+    uint8_t *base[AV_NUM_DATA_POINTERS];
+    uint8_t *data[AV_NUM_DATA_POINTERS];
+    int linesize[AV_NUM_DATA_POINTERS];
+    int width;
+    int height;
+    enum PixelFormat pix_fmt;
+    uint8_t **extended_data;
+    int audio_data_size;
+    int nb_channels;
+} InternalBuffer;
+
+typedef struct AVCodecInternal {
+    /**
+     * internal buffer count
+     * used by default get/release/reget_buffer().
+     */
+    int buffer_count;
+
+    /**
+     * internal buffers
+     * used by default get/release/reget_buffer().
+     */
+    InternalBuffer *buffer;
+
+    /**
+     * Whether the parent AVCodecContext is a copy of the context which had
+     * init() called on it.
+     * This is used by multithreading - shared tables and picture pointers
+     * should be freed from the original context only.
+     */
+    int is_copy;
+} AVCodecInternal;
+
 struct AVCodecDefault {
     const uint8_t *key;
     const uint8_t *value;
@@ -53,11 +89,14 @@ AVHWAccel *ff_find_hwaccel(enum CodecID codec_id, enum PixelFormat pix_fmt);
  */
 int ff_match_2uint16(const uint16_t (*tab)[2], int size, int a, int b);
 
-unsigned int ff_toupper4(unsigned int x);
+unsigned int avpriv_toupper4(unsigned int x);
 
 /**
  * does needed setup of pkt_pts/pos and such for (re)get_buffer();
  */
 void ff_init_buffer_info(AVCodecContext *s, AVFrame *pic);
 
+int avpriv_lock_avformat(void);
+int avpriv_unlock_avformat(void);
+
 #endif /* AVCODEC_INTERNAL_H */