Merge commit '54dd9b1cdd9e54f1ee39ae25af0324f8aba2831b'
authorClément Bœsch <u@pkh.me>
Wed, 27 Jul 2016 14:11:02 +0000 (16:11 +0200)
committerClément Bœsch <u@pkh.me>
Wed, 27 Jul 2016 15:00:14 +0000 (17:00 +0200)
commit78c7197ea0e5c53393849a32dd6f49e3b89f7815
tree3d7a5eeccfa77d746cb82018ffbdef8c94a11959
parent376d8fb2c5742e6718323d6a69479c6ee68dd75b
parent54dd9b1cdd9e54f1ee39ae25af0324f8aba2831b
Merge commit '54dd9b1cdd9e54f1ee39ae25af0324f8aba2831b'

* commit '54dd9b1cdd9e54f1ee39ae25af0324f8aba2831b':
  h264: set mb_aff_frame in frame_start()
  h264: move the block starting a new field out of slice_header_parse()

Both commits are merged at the same time in order to prevent a
regression with Ticket #4440 (see 38660128).

Merged-by: Clément Bœsch <u@pkh.me>
libavcodec/h264_slice.c