diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-09 05:04:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-09 05:06:48 +0200 |
| commit | 07ae8fa20ef202206157efebf0a09db9a9cb9634 (patch) | |
| tree | 75e15cb455b62eac5a0dff6e95cd90ffe2a99e08 /libavcodec/hevc.h | |
| parent | 1dacf26964c9a65380ca615d1fc09302218a539e (diff) | |
| parent | 69ab9f53f901eac6a649e22d28cf093357870627 (diff) | |
| download | ffmpeg-07ae8fa20ef202206157efebf0a09db9a9cb9634.tar.gz | |
Merge commit '69ab9f53f901eac6a649e22d28cf093357870627'
* commit '69ab9f53f901eac6a649e22d28cf093357870627':
hevc: split bitstream unescaping to a separate file
Conflicts:
libavcodec/Makefile
libavcodec/hevc.c
See: afa93d198aaf2cc661c4df6d4095cd030265d30a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevc.h')
| -rw-r--r-- | libavcodec/hevc.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h index 8ab9f84f6f..bd0c48bf81 100644 --- a/libavcodec/hevc.h +++ b/libavcodec/hevc.h @@ -944,9 +944,6 @@ int ff_hevc_decode_nal_sps(HEVCContext *s); int ff_hevc_decode_nal_pps(HEVCContext *s); int ff_hevc_decode_nal_sei(HEVCContext *s); -int ff_hevc_extract_rbsp(HEVCContext *s, const uint8_t *src, int length, - HEVCNAL *nal); - /** * Mark all frames in DPB as unused for reference. */ @@ -1051,6 +1048,12 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, void ff_hevc_hls_mvd_coding(HEVCContext *s, int x0, int y0, int log2_cb_size); +/** + * Extract the raw (unescaped) HEVC bitstream. + */ +int ff_hevc_extract_rbsp(HEVCContext *s, const uint8_t *src, int length, + HEVCNAL *nal); + extern const uint8_t ff_hevc_qpel_extra_before[4]; extern const uint8_t ff_hevc_qpel_extra_after[4]; extern const uint8_t ff_hevc_qpel_extra[4]; |