[SCM] libav/experimental: Make ff_h264_decode_rbsp_trailing static to h264.c

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:22:44 UTC 2013


The following commit has been merged in the experimental branch:
commit 8529731961d79fc0e747b16152df3d470b530537
Author: Diego Elio Pettenò <flameeyes at gmail.com>
Date:   Tue Jan 25 02:29:42 2011 +0100

    Make ff_h264_decode_rbsp_trailing static to h264.c
    
    Signed-off-by: Janne Grunau <janne-ffmpeg at jannau.net>

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index d56c293..25417f7 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -233,7 +233,11 @@ nsc:
     return dst;
 }
 
-int ff_h264_decode_rbsp_trailing(H264Context *h, const uint8_t *src){
+/**
+ * Identify the exact end of the bitstream
+ * @return the length of the trailing, or 0 if damaged
+ */
+static int ff_h264_decode_rbsp_trailing(H264Context *h, const uint8_t *src){
     int v= *src;
     int r;
 
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index 17fd680..f4f9b25 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -626,12 +626,6 @@ int ff_h264_decode_picture_parameter_set(H264Context *h, int bit_length);
 const uint8_t *ff_h264_decode_nal(H264Context *h, const uint8_t *src, int *dst_length, int *consumed, int length);
 
 /**
- * Identify the exact end of the bitstream
- * @return the length of the trailing, or 0 if damaged
- */
-int ff_h264_decode_rbsp_trailing(H264Context *h, const uint8_t *src);
-
-/**
  * Free any data that may have been allocated in the H264 context like SPS, PPS etc.
  */
 av_cold void ff_h264_free_context(H264Context *h);

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list