diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-05-17 14:21:12 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-05-17 14:21:12 +0200 |
| commit | 15ad0232107496c3b12d8aaedfc3398b8cda9ee7 (patch) | |
| tree | 42a4576116d4e96448468acc18386efe004a2128 /libavcodec/h264.h | |
| parent | a9bb4cf87d1eb68f9ed2dc971e3400b95c1a6a78 (diff) | |
| parent | 8d0cc8ca97678f4ca87948ebabcbaab5a4f4c1f6 (diff) | |
| download | ffmpeg-15ad0232107496c3b12d8aaedfc3398b8cda9ee7.tar.gz | |
Merge commit '8d0cc8ca97678f4ca87948ebabcbaab5a4f4c1f6'
* commit '8d0cc8ca97678f4ca87948ebabcbaab5a4f4c1f6':
h264_parser: switch to h2645_parse for NAL unescaping
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 33a73ba50c..2659e55157 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -861,17 +861,6 @@ int ff_h264_get_profile(SPS *sps); int ff_h264_decode_picture_parameter_set(H264Context *h, int bit_length); /** - * Decode a network abstraction layer unit. - * @param consumed is the number of bytes used as input - * @param length is the length of the array - * @param dst_length is the number of decoded bytes FIXME here - * or a decode rbsp tailing? - * @return decoded bytes, might be src+1 if no escapes - */ -const uint8_t *ff_h264_decode_nal(H264Context *h, H264SliceContext *sl, const uint8_t *src, - int *dst_length, int *consumed, int length); - -/** * Free any data that may have been allocated in the H264 context * like SPS, PPS etc. */ |