Merge commit '98c97994c5b90bdae02accb155eeceeb5224b8ef'
authorClément Bœsch <u@pkh.me>
Sun, 19 Jun 2016 10:17:41 +0000 (12:17 +0200)
committerClément Bœsch <u@pkh.me>
Sun, 19 Jun 2016 10:17:41 +0000 (12:17 +0200)
commit0bf5fd2e19b081ce17e523944c2735586b008159
tree72ff0ebd574dd615d59175c500dc8bb1b7428b5f
parent8a135a55b3570441b6147c94f24c71e5c81ac916
parent98c97994c5b90bdae02accb155eeceeb5224b8ef
Merge commit '98c97994c5b90bdae02accb155eeceeb5224b8ef'

* commit '98c97994c5b90bdae02accb155eeceeb5224b8ef':
  h264: decouple extradata parsing from the decoder

Main changes:

- move get_avc_nalsize() inside h264_parser.c and make it use
  H264ParseContext instead of H264Context. This helps fixing
  fate-flv-demux.

- Also use is_avc/nal_length_size from the H264ParseContext in various
  places instead of the H264Context one as that's the fields now filled
  by ff_h264_decode_extradata()

- h264_parse: dont fail decode_extradata_ps() due to nal split failure.
  Change by Michael to fix decoding of h264/ref_10.avi.

Merged-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_parse.c
libavcodec/h264_parse.h
libavcodec/h264_parser.c