[PATCH] Exported get_slice_type() as ff_h264_get_slice_type().

[Laurent Aimar]

---
 libavcodec/h264.c       |   12 ++++++++++++
 libavcodec/h264.h       |    5 +++++
 libavcodec/vaapi_h264.c |   15 +--------------
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index bc79f66..34261a2 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -4155,6 +4155,18 @@ static int decode_slice_header(H264Context *h, H264Context *h0){
     return 0;
 }
 
+int ff_h264_get_slice_type(H264Context *h)
+{
+    switch (h->slice_type) {
+    case FF_P_TYPE:  return 0;
+    case FF_B_TYPE:  return 1;
+    case FF_I_TYPE:  return 2;
+    case FF_SP_TYPE: return 3;
+    case FF_SI_TYPE: return 4;
+    default:         return -1;
+    }
+}
+
 /**
  *
  */
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index fa348a2..91ecee5 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -582,4 +582,9 @@ int ff_h264_decode_rbsp_trailing(H264Context *h, const uint8_t *src);
  */
 av_cold void ff_h264_free_context(H264Context *h);
 
+/**
+ * reconstructs bitstream slice_type.
+ */
+int ff_h264_get_slice_type(H264Context *h);
+
 #endif /* AVCODEC_H264_H */
diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c
index 265cd3f..9f440c0 100644
--- a/libavcodec/vaapi_h264.c
+++ b/libavcodec/vaapi_h264.c
@@ -28,19 +28,6 @@
  *  structures for H.264 decoding.
  */
 
-/** Reconstructs bitstream slice_type. */
-static int get_slice_type(H264Context *h)
-{
-    switch (h->slice_type) {
-    case FF_P_TYPE:  return 0;
-    case FF_B_TYPE:  return 1;
-    case FF_I_TYPE:  return 2;
-    case FF_SP_TYPE: return 3;
-    case FF_SI_TYPE: return 4;
-    default:         return -1;
-    }
-}
-
 /**
  * Initializes an empty VA API picture.
  *
@@ -323,7 +310,7 @@ static int decode_slice(AVCodecContext *avctx,
         return -1;
     slice_param->slice_data_bit_offset          = get_bits_count(&h->s.gb) + 8; /* bit buffer started beyond nal_unit_type */
     slice_param->first_mb_in_slice              = (s->mb_y >> FIELD_OR_MBAFF_PICTURE) * s->mb_width + s->mb_x;
-    slice_param->slice_type                     = get_slice_type(h);
+    slice_param->slice_type                     = ff_h264_get_slice_type(h);
     slice_param->direct_spatial_mv_pred_flag    = h->slice_type == FF_B_TYPE ? h->direct_spatial_mv_pred : 0;
     slice_param->num_ref_idx_l0_active_minus1   = h->list_count > 0 ? h->ref_count[0] - 1 : 0;
     slice_param->num_ref_idx_l1_active_minus1   = h->list_count > 1 ? h->ref_count[1] - 1 : 0;
-- 
1.5.6.5


--tKW2IUtsqtDRztdT
Content-Type: text/x-diff; charset=iso-8859-1
Content-Disposition: attachment; filename="ffmpeg-h264-slice-type-2.patch"