diff options
| author | Clément Bœsch <cboesch@gopro.com> | 2017-05-05 11:33:17 +0200 |
|---|---|---|
| committer | Clément Bœsch <cboesch@gopro.com> | 2017-05-05 11:33:39 +0200 |
| commit | 20e72faef6946cde8e59981ef511b824a01c5adb (patch) | |
| tree | e35c82f841089a3e1dfd52adabbef05ec5fccf6d /libavcodec/h264dec.h | |
| parent | cb0eba71f047944ccc1220fca04c50f45f88a8ff (diff) | |
| parent | f1af37b51033ad90e56a8d7dfcc366f2bd9d2fed (diff) | |
| download | ffmpeg-20e72faef6946cde8e59981ef511b824a01c5adb.tar.gz | |
Merge commit 'f1af37b51033ad90e56a8d7dfcc366f2bd9d2fed'
* commit 'f1af37b51033ad90e56a8d7dfcc366f2bd9d2fed':
h264dec: make ff_h264_decode_init() static
Merged-by: Clément Bœsch <cboesch@gopro.com>
Diffstat (limited to 'libavcodec/h264dec.h')
| -rw-r--r-- | libavcodec/h264dec.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h index e994f7e7fe..1c0dfbf7f7 100644 --- a/libavcodec/h264dec.h +++ b/libavcodec/h264dec.h @@ -571,7 +571,6 @@ int ff_h264_decode_ref_pic_marking(H264SliceContext *sl, GetBitContext *gb, const H2645NAL *nal, void *logctx); void ff_h264_hl_decode_mb(const H264Context *h, H264SliceContext *sl); -int ff_h264_decode_init(AVCodecContext *avctx); void ff_h264_decode_init_vlc(void); /** |