• Clément Bœsch's avatar
    Merge commit '98c97994' · 0bf5fd2e
    Clément Bœsch authored
    * commit '98c97994':
      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: 's avatarClément Bœsch <u@pkh.me>
    Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
    0bf5fd2e
h264_parse.c 16 KB