virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit '25408b2a0660c1e6c8555559c4ed71dff2ede31e'

Browse Source 
* commit '25408b2a0660c1e6c8555559c4ed71dff2ede31e':
  h264: make ff_h264_frame_start static.

Conflicts:
	libavcodec/h264.c
	libavcodec/h264.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-03-21 12:05:13 +01:00
commit bbc0f6f978
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/h264.c
View File

@ -1806,7 +1806,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;
@ -3505,7 +3505,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
if (!h->sps.gaps_in_frame_num_allowed_flag) if (!h->sps.gaps_in_frame_num_allowed_flag)
for(i=0; i<FF_ARRAY_ELEMS(h->last_pocs); i++) for(i=0; i<FF_ARRAY_ELEMS(h->last_pocs); i++)
h->last_pocs[i] = INT_MIN; h->last_pocs[i] = INT_MIN;
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;
@ -3569,7 +3569,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;
} }

1
libavcodec/h264.h
View File

@ -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); 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, const uint8_t *buf, int size); int ff_h264_decode_extradata(H264Context *h, const uint8_t *buf, int size);
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);