diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-03-09 20:21:17 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-03-21 10:19:54 +0100 |
| commit | 25408b2a0660c1e6c8555559c4ed71dff2ede31e (patch) | |
| tree | 24543b24ab0e959e25674af9ddd3451dd4857059 /libavcodec | |
| parent | 1c4073efd24164ac6eaa52c544f5cdb0e5f6aee5 (diff) | |
| download | ffmpeg-25408b2a0660c1e6c8555559c4ed71dff2ede31e.tar.gz | |
h264: make ff_h264_frame_start static.
It is not called from outside h264.c
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264.c | 8 | ||||
| -rw-r--r-- | libavcodec/h264.h | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index fe4acd69e6..f49bb8da67 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1595,7 +1595,7 @@ static int decode_update_thread_context(AVCodecContext *dst, context_reinitialized = 1; /* update linesize on resize. The decoder doesn't - * necessarily call ff_h264_frame_start in the new thread */ + * necessarily call h264_frame_start in the new thread */ h->linesize = h1->linesize; h->uvlinesize = h1->uvlinesize; @@ -1738,7 +1738,7 @@ static int decode_update_thread_context(AVCodecContext *dst, return err; } -int ff_h264_frame_start(H264Context *h) +static int h264_frame_start(H264Context *h) { Picture *pic; int i, ret; @@ -3377,7 +3377,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0) Picture *prev = h->short_ref_count ? h->short_ref[0] : NULL; av_log(h->avctx, AV_LOG_DEBUG, "Frame num gap %d %d\n", h->frame_num, h->prev_frame_num); - if (ff_h264_frame_start(h) < 0) + if (h264_frame_start(h) < 0) return -1; h->prev_frame_num++; h->prev_frame_num %= 1 << h->sps.log2_max_frame_num; @@ -3439,7 +3439,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0) } if (!FIELD_PICTURE || h0->first_field) { - if (ff_h264_frame_start(h) < 0) { + if (h264_frame_start(h) < 0) { h0->first_field = 0; return -1; } diff --git a/libavcodec/h264.h b/libavcodec/h264.h index e33f37e359..3482d897aa 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -709,7 +709,6 @@ int ff_h264_check_intra4x4_pred_mode(H264Context *h); int ff_h264_check_intra_pred_mode(H264Context *h, int mode, int is_chroma); void ff_h264_hl_decode_mb(H264Context *h); -int ff_h264_frame_start(H264Context *h); int ff_h264_decode_extradata(H264Context *h); int ff_h264_decode_init(AVCodecContext *avctx); void ff_h264_decode_init_vlc(void); |