diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-21 12:05:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-21 12:05:13 +0100 |
| commit | bbc0f6f9789361f9ddd462bc458410e6f0081d57 (patch) | |
| tree | b26ceba305959785c11ef932c183a9639f31d91d /libavcodec | |
| parent | 6c8ac2d78230990f3a01be28d3ef68fb281d6609 (diff) | |
| parent | 25408b2a0660c1e6c8555559c4ed71dff2ede31e (diff) | |
| download | ffmpeg-bbc0f6f9789361f9ddd462bc458410e6f0081d57.tar.gz | |
Merge commit '25408b2a0660c1e6c8555559c4ed71dff2ede31e'
* commit '25408b2a0660c1e6c8555559c4ed71dff2ede31e':
h264: make ff_h264_frame_start static.
Conflicts:
libavcodec/h264.c
libavcodec/h264.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264.c | 6 | ||||
| -rw-r--r-- | libavcodec/h264.h | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 3c4f5095b1..0d31a380eb 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1806,7 +1806,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; @@ -3505,7 +3505,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0) if (!h->sps.gaps_in_frame_num_allowed_flag) for(i=0; i<FF_ARRAY_ELEMS(h->last_pocs); i++) h->last_pocs[i] = INT_MIN; - 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; @@ -3569,7 +3569,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 939426e9c5..c36cf70821 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -736,7 +736,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, const uint8_t *buf, int size); int ff_h264_decode_init(AVCodecContext *avctx); void ff_h264_decode_init_vlc(void); |