diff options
| author | Diego Elio Pettenò <flameeyes@gmail.com> | 2011-01-25 02:29:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-01-26 03:43:31 +0100 |
| commit | 123241214cebfc4e55789f611fc09dc253dca39a (patch) | |
| tree | 23d1b1267736b4408e632b2b2eb1ceec75af5cb6 | |
| parent | d20d1449e0eea245c483c0b97faf38df5092ff2f (diff) | |
| download | ffmpeg-123241214cebfc4e55789f611fc09dc253dca39a.tar.gz | |
Make ff_h264_decode_rbsp_trailing static to h264.c
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 8529731961d79fc0e747b16152df3d470b530537)
| -rw-r--r-- | libavcodec/h264.c | 6 | ||||
| -rw-r--r-- | libavcodec/h264.h | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index d56c29331e..25417f7c4a 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 17fd680369..f4f9b25739 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); |