diff options
| author | Clément Bœsch <clement@stupeflix.com> | 2016-06-20 12:00:29 +0200 |
|---|---|---|
| committer | Clément Bœsch <clement@stupeflix.com> | 2016-06-20 12:03:21 +0200 |
| commit | c957909a9f48196bfb4cb295c750ec6d495d7bbb (patch) | |
| tree | 527a562837b64e20ef52df4dfdd0af4b9261fb94 /libavcodec/h264.h | |
| parent | d98ca4b14c673db8eb3cc124e42ff7a660da9109 (diff) | |
| parent | 7f045c4429e91688f1f2335dd347203431901c06 (diff) | |
| download | ffmpeg-c957909a9f48196bfb4cb295c750ec6d495d7bbb.tar.gz | |
Merge commit '7f045c4429e91688f1f2335dd347203431901c06'
* commit '7f045c4429e91688f1f2335dd347203431901c06':
h264: merge ff_h264_free_context() into h264_decode_end()
Merged-by: Clément Bœsch <clement@stupeflix.com>
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 7b0555e362..010f6883e7 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -713,12 +713,6 @@ int ff_h264_decode_picture_parameter_set(GetBitContext *gb, AVCodecContext *avct H264ParamSets *ps, int bit_length); /** - * Free any data that may have been allocated in the H264 context - * like SPS, PPS etc. - */ -void ff_h264_free_context(H264Context *h); - -/** * Reconstruct bitstream slice_type. */ int ff_h264_get_slice_type(const H264SliceContext *sl); |