diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2013-08-02 18:36:29 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-08-10 13:36:25 +0200 |
| commit | 5eb488bfa835f2902a31ba99d57c16ae36c4f598 (patch) | |
| tree | 1c4a734836e3e78b169a70b8f5637a7b71e6d347 | |
| parent | b3dc260e7fa6f3f852dd5cb7d86763c4b5736714 (diff) | |
| download | ffmpeg-5eb488bfa835f2902a31ba99d57c16ae36c4f598.tar.gz | |
h264: use explicit variable names for *_field_flag
Signed-off-by: Anton Khirnov <anton@khirnov.net>
| -rw-r--r-- | libavcodec/h264.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index f68b189294..d4f04c6298 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -3125,6 +3125,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0) int default_ref_list_done = 0; int last_pic_structure, last_pic_droppable; 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_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) { h->picture_structure = PICT_FRAME; } else { - if (get_bits1(&h->gb)) { // field_pic_flag - h->picture_structure = PICT_TOP_FIELD + get_bits1(&h->gb); // bottom_field_flag + field_pic_flag = get_bits1(&h->gb); + if (field_pic_flag) { + bottom_field_flag = get_bits1(&h->gb); + h->picture_structure = PICT_TOP_FIELD + bottom_field_flag; } else { h->picture_structure = PICT_FRAME; h->mb_aff_frame = h->sps.mb_aff; |