[vlc-commits] packetizer: h264: prefix poc_context_t

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Fri Sep 29 18:34:03 2017 +0200| [13f54c0a299cb47f995f5057ca8a40681c0a9730] | committer: Francois Cartegnie

packetizer: h264: prefix poc_context_t

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=13f54c0a299cb47f995f5057ca8a40681c0a9730
---

 modules/codec/videotoolbox.m    | 2 +-
 modules/packetizer/h264.c       | 2 +-
 modules/packetizer/h264_slice.c | 2 +-
 modules/packetizer/h264_slice.h | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/codec/videotoolbox.m b/modules/codec/videotoolbox.m
index 1267930716..c0e9b4cc0a 100644
--- a/modules/codec/videotoolbox.m
+++ b/modules/codec/videotoolbox.m
@@ -159,7 +159,7 @@ struct decoder_sys_t
 
     int                         i_forced_cvpx_format;
 
-    poc_context_t               pocctx;
+    h264_poc_context_t          pocctx;
     date_t                      pts;
 };
 
diff --git a/modules/packetizer/h264.c b/modules/packetizer/h264.c
index a6814229c1..f209ed455a 100644
--- a/modules/packetizer/h264.c
+++ b/modules/packetizer/h264.c
@@ -114,7 +114,7 @@ struct decoder_sys_t
     unsigned i_recoveryfnum;
 
     /* POC */
-    poc_context_t pocctx;
+    h264_poc_context_t pocctx;
     struct
     {
         mtime_t pts;
diff --git a/modules/packetizer/h264_slice.c b/modules/packetizer/h264_slice.c
index a372a0d6e3..574846f52a 100644
--- a/modules/packetizer/h264_slice.c
+++ b/modules/packetizer/h264_slice.c
@@ -215,7 +215,7 @@ bool h264_decode_slice( const uint8_t *p_buffer, size_t i_buffer,
 
 
 void h264_compute_poc( const h264_sequence_parameter_set_t *p_sps,
-                       const h264_slice_t *p_slice, poc_context_t *p_ctx,
+                       const h264_slice_t *p_slice, h264_poc_context_t *p_ctx,
                        int *p_PictureOrderCount, int *p_tFOC, int *p_bFOC )
 {
     *p_tFOC = *p_bFOC = 0;
diff --git a/modules/packetizer/h264_slice.h b/modules/packetizer/h264_slice.h
index 03fccfd5bb..301e57397f 100644
--- a/modules/packetizer/h264_slice.h
+++ b/modules/packetizer/h264_slice.h
@@ -90,9 +90,9 @@ typedef struct
     int  prevRefPictureTFOC;
     bool prevRefPictureIsBottomField;
     bool prevRefPictureHasMMCO5;
-} poc_context_t;
+} h264_poc_context_t;
 
-static inline void h264_poc_context_init( poc_context_t *p_ctx )
+static inline void h264_poc_context_init( h264_poc_context_t *p_ctx )
 {
     p_ctx->prevPicOrderCnt.lsb = 0;
     p_ctx->prevPicOrderCnt.msb = 0;
@@ -103,7 +103,7 @@ static inline void h264_poc_context_init( poc_context_t *p_ctx )
 }
 
 void h264_compute_poc( const h264_sequence_parameter_set_t *p_sps,
-                       const h264_slice_t *p_slice, poc_context_t *p_ctx,
+                       const h264_slice_t *p_slice, h264_poc_context_t *p_ctx,
                        int *p_PictureOrderCount, int *p_tFOC, int *p_bFOC );
 
 uint8_t h264_get_num_ts( const h264_sequence_parameter_set_t *p_sps,