Commit 25408b2a authored by Anton Khirnov's avatar Anton Khirnov

h264: make ff_h264_frame_start static.

It is not called from outside h264.c
parent 1c4073ef
...@@ -1595,7 +1595,7 @@ static int decode_update_thread_context(AVCodecContext *dst, ...@@ -1595,7 +1595,7 @@ static int decode_update_thread_context(AVCodecContext *dst,
context_reinitialized = 1; context_reinitialized = 1;
/* update linesize on resize. The decoder doesn't /* 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->linesize = h1->linesize;
h->uvlinesize = h1->uvlinesize; h->uvlinesize = h1->uvlinesize;
...@@ -1738,7 +1738,7 @@ static int decode_update_thread_context(AVCodecContext *dst, ...@@ -1738,7 +1738,7 @@ static int decode_update_thread_context(AVCodecContext *dst,
return err; return err;
} }
int ff_h264_frame_start(H264Context *h) static int h264_frame_start(H264Context *h)
{ {
Picture *pic; Picture *pic;
int i, ret; int i, ret;
...@@ -3377,7 +3377,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0) ...@@ -3377,7 +3377,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
Picture *prev = h->short_ref_count ? h->short_ref[0] : NULL; Picture *prev = h->short_ref_count ? h->short_ref[0] : NULL;
av_log(h->avctx, AV_LOG_DEBUG, "Frame num gap %d %d\n", av_log(h->avctx, AV_LOG_DEBUG, "Frame num gap %d %d\n",
h->frame_num, h->prev_frame_num); h->frame_num, h->prev_frame_num);
if (ff_h264_frame_start(h) < 0) if (h264_frame_start(h) < 0)
return -1; return -1;
h->prev_frame_num++; h->prev_frame_num++;
h->prev_frame_num %= 1 << h->sps.log2_max_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) ...@@ -3439,7 +3439,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
} }
if (!FIELD_PICTURE || h0->first_field) { if (!FIELD_PICTURE || h0->first_field) {
if (ff_h264_frame_start(h) < 0) { if (h264_frame_start(h) < 0) {
h0->first_field = 0; h0->first_field = 0;
return -1; return -1;
} }
......
...@@ -709,7 +709,6 @@ int ff_h264_check_intra4x4_pred_mode(H264Context *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); int ff_h264_check_intra_pred_mode(H264Context *h, int mode, int is_chroma);
void ff_h264_hl_decode_mb(H264Context *h); 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_extradata(H264Context *h);
int ff_h264_decode_init(AVCodecContext *avctx); int ff_h264_decode_init(AVCodecContext *avctx);
void ff_h264_decode_init_vlc(void); void ff_h264_decode_init_vlc(void);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment