Changeset 0bf5fd2e in ffmpeg

Timestamp:

Jun 19, 2016, 10:17:41 AM (8 years ago)

Author:

Clément Bœsch <u@pkh.me>

Branches:

master

Children:

48ea5433

Parents:

8a135a5 (diff), 98c97994 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

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>

(No files)