[FFmpeg-cvslog] avcodec/h264dec: move ff_h264_ps_uninit prototype to h264_ps.h

James Almer git at videolan.org
Wed Aug 3 06:38:37 EEST 2016


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Wed Aug  3 00:36:09 2016 -0300| [613c86299ffe43fba81053845665d4b23f53d690] | committer: James Almer

avcodec/h264dec: move ff_h264_ps_uninit prototype to h264_ps.h

It's the proper place since 8c7932884d09bc580036640453fd6b7ad4dd77b4

Signed-off-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=613c86299ffe43fba81053845665d4b23f53d690
---

 libavcodec/h264_ps.h | 5 +++++
 libavcodec/h264dec.h | 6 ------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/libavcodec/h264_ps.h b/libavcodec/h264_ps.h
index ecf3a58..9b9e295 100644
--- a/libavcodec/h264_ps.h
+++ b/libavcodec/h264_ps.h
@@ -156,4 +156,9 @@ int ff_h264_decode_seq_parameter_set(GetBitContext *gb, AVCodecContext *avctx,
 int ff_h264_decode_picture_parameter_set(GetBitContext *gb, AVCodecContext *avctx,
                                          H264ParamSets *ps, int bit_length);
 
+/**
+ * Uninit H264 param sets structure.
+ */
+void ff_h264_ps_uninit(H264ParamSets *ps);
+
 #endif /* AVCODEC_H264_PS_H */
diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h
index a73a9dd..7634261 100644
--- a/libavcodec/h264dec.h
+++ b/libavcodec/h264dec.h
@@ -564,12 +564,6 @@ typedef struct H264Context {
 extern const uint16_t ff_h264_mb_sizes[4];
 
 /**
- * Uninit H264 param sets structure.
- */
-
-void ff_h264_ps_uninit(H264ParamSets *ps);
-
-/**
  * Reconstruct bitstream slice_type.
  */
 int ff_h264_get_slice_type(const H264SliceContext *sl);



More information about the ffmpeg-cvslog mailing list