Merge commit '38efff92f1ef81f3de20ff0460ec7b70c253d714'
authorClément Bœsch <u@pkh.me>
Tue, 17 Jan 2017 14:26:38 +0000 (15:26 +0100)
committerClément Bœsch <u@pkh.me>
Tue, 24 Jan 2017 15:13:03 +0000 (16:13 +0100)
commit744801989099df26e90b00062c645969c5347533
tree776f86b3709a4355e967712065866fb89297be19
parent1033f56b074d0aaf95fe2a0c356cd63cbb7f31aa
parent38efff92f1ef81f3de20ff0460ec7b70c253d714
Merge commit '38efff92f1ef81f3de20ff0460ec7b70c253d714'

* commit '38efff92f1ef81f3de20ff0460ec7b70c253d714':
  FATE: add a test for H.264 with two fields per packet
  h264: fix decoding multiple fields per packet with slice threads

This merge includes two commits because the FATE test was useful in
order to make proper testing.

The merge gets rid of the now unused:
- SLICE_SINGLETHREAD and SLICE_SKIPED macros
- max_contexts
- "again" label in decode_nal_units()

This commit also includes the fix from d3e4d406b.

Thanks to wm4 and Michael Niedermayer for their testing.

Merged-by: Clément Bœsch <u@pkh.me>
Merged-by: Matthieu Bouron <matthieu.bouron@gmail.com>
libavcodec/h264_slice.c
libavcodec/h264dec.c
libavcodec/h264dec.h
tests/fate/h264.mak
tests/ref/fate/h264-twofields-packet