Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / internal.h

diff --git a/libavcodec/internal.h b/libavcodec/internal.h
index 68f49b5f1e84704d88f26091d9a5496558c2d377..375c5674590e85f02268f50e96939c21d309b8da 100644 (file)
--- a/libavcodec/internal.h
+++ b/libavcodec/internal.h
@@ -53,11 +53,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 */