generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

h264: use explicit variable names for *_field_flag

Browse Source 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Vittorio Giovara
2013-08-02 18:36:29 +02:00
committed by Anton Khirnov
parent b3dc260e7f
commit 5eb488bfa8
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/h264.c
View File

@@ -3125,6 +3125,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
int default_ref_list_done = 0; int default_ref_list_done = 0;
int last_pic_structure, last_pic_droppable; int last_pic_structure, last_pic_droppable;
int needs_reinit = 0; int needs_reinit = 0;
int field_pic_flag, bottom_field_flag;
h->me.qpel_put = h->h264qpel.put_h264_qpel_pixels_tab; h->me.qpel_put = h->h264qpel.put_h264_qpel_pixels_tab;
h->me.qpel_avg = h->h264qpel.avg_h264_qpel_pixels_tab; h->me.qpel_avg = h->h264qpel.avg_h264_qpel_pixels_tab;
@@ -3301,8 +3302,10 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
if (h->sps.frame_mbs_only_flag) { if (h->sps.frame_mbs_only_flag) {
h->picture_structure = PICT_FRAME; h->picture_structure = PICT_FRAME;
} else { } else {
if (get_bits1(&h->gb)) { // field_pic_flag field_pic_flag = get_bits1(&h->gb);
h->picture_structure = PICT_TOP_FIELD + get_bits1(&h->gb); // bottom_field_flag if (field_pic_flag) {
bottom_field_flag = get_bits1(&h->gb);
h->picture_structure = PICT_TOP_FIELD + bottom_field_flag;
} else { } else {
h->picture_structure = PICT_FRAME; h->picture_structure = PICT_FRAME;
h->mb_aff_frame = h->sps.mb_aff; h->mb_aff_frame = h->sps.mb_aff;