virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Merge commit '9d33bab583a82cf12286c65258a29c6888e1ff98'

Browse Source 
* commit '9d33bab583a82cf12286c65258a29c6888e1ff98':
  h264: drop H264Context.ouputed_poc

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-04-29 11:38:42 +02:00
parent 0d5e615c10 9d33bab583
commit e8a460672f
4 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/h264.c
View File

@@ -629,7 +629,7 @@ static int h264_init_context(AVCodecContext *avctx, H264Context *h)
h->prev_frame_num = -1; h->prev_frame_num = -1;
h->sei_fpa.frame_packing_arrangement_cancel_flag = -1; h->sei_fpa.frame_packing_arrangement_cancel_flag = -1;
h->outputed_poc = h->next_outputed_poc = INT_MIN; h->next_outputed_poc = INT_MIN;
for (i = 0; i < MAX_DELAYED_PIC_COUNT; i++) for (i = 0; i < MAX_DELAYED_PIC_COUNT; i++)
h->last_pocs[i] = INT_MIN; h->last_pocs[i] = INT_MIN;
@@ -1066,7 +1066,7 @@ void ff_h264_flush_change(H264Context *h)
{ {
int i, j; int i, j;
h->outputed_poc = h->next_outputed_poc = INT_MIN; h->next_outputed_poc = INT_MIN;
h->prev_interlaced_frame = 1; h->prev_interlaced_frame = 1;
idr(h); idr(h);

1
libavcodec/h264.h
View File

@@ -645,7 +645,6 @@ typedef struct H264Context {
H264Picture *delayed_pic[MAX_DELAYED_PIC_COUNT + 2]; // FIXME size? H264Picture *delayed_pic[MAX_DELAYED_PIC_COUNT + 2]; // FIXME size?
int last_pocs[MAX_DELAYED_PIC_COUNT]; int last_pocs[MAX_DELAYED_PIC_COUNT];
H264Picture *next_output_pic; H264Picture *next_output_pic;
int outputed_poc;
int next_outputed_poc; int next_outputed_poc;
/** /**

1
libavcodec/h264_picture.c
View File

@@ -169,7 +169,6 @@ int ff_h264_field_end(H264Context *h, H264SliceContext *sl, int in_setup)
} }
h->prev_frame_num_offset = h->frame_num_offset; h->prev_frame_num_offset = h->frame_num_offset;
h->prev_frame_num = h->frame_num; h->prev_frame_num = h->frame_num;
h->outputed_poc = h->next_outputed_poc;
} }
if (avctx->hwaccel) { if (avctx->hwaccel) {

1
libavcodec/h264_slice.c
View File

@@ -636,7 +636,6 @@ int ff_h264_update_thread_context(AVCodecContext *dst,
} }
h->prev_frame_num_offset = h->frame_num_offset; h->prev_frame_num_offset = h->frame_num_offset;
h->prev_frame_num = h->frame_num; h->prev_frame_num = h->frame_num;
h->outputed_poc = h->next_outputed_poc;
h->recovery_frame = h1->recovery_frame; h->recovery_frame = h1->recovery_frame;