avcodec, avformat: Remove AVPacket.convergence_duration

[ffmpeg] / libavcodec / h264dec.h

diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h
index 29c4d4e42c1e3445b9ddfce9beb49316670027d8..8954b74795619f8252221d80a507e79f3500c7d2 100644 (file)
--- a/libavcodec/h264dec.h
+++ b/libavcodec/h264dec.h
@@ -30,6 +30,7 @@
 
 #include "libavutil/buffer.h"
 #include "libavutil/intreadwrite.h"
+#include "libavutil/mem_internal.h"
 #include "libavutil/thread.h"
 
 #include "cabac.h"
@@ -848,6 +849,8 @@ int ff_h264_queue_decode_slice(H264Context *h, const H2645NAL *nal);
 int ff_h264_execute_decode_slices(H264Context *h);
 int ff_h264_update_thread_context(AVCodecContext *dst,
                                   const AVCodecContext *src);
+int ff_h264_update_thread_context_for_user(AVCodecContext *dst,
+                                           const AVCodecContext *src);
 
 void ff_h264_flush_change(H264Context *h);