virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

h264: make ff_h264_frame_start static.

Browse Source 
It is not called from outside h264.c
This commit is contained in:
Anton Khirnov 2013-03-09 20:21:17 +01:00
parent 1c4073efd2
commit 25408b2a06
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/h264.c
View File

@ -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;
}

1
libavcodec/h264.h
View File

@ -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);