• Clément Bœsch's avatar
    Merge commit '728d90a0' · 5584f019
    Clément Bœsch authored
    * commit '728d90a0':
      h264: decouple h264_sei from the h264 decoder
    
    Main changes:
    
    - SEI decoding doesn't have access to the debug flag in the codec context so a
      few logging are dropped.
    
    - naming of quincunx_sampling_flag and frame_packing_arrangement_type are kept
      as they are in FFmpeg instead of respectively quincunx_subsampling and
      arrangement_type used in Libav because the former match the specifications.
    
    - don't reset the x264 build info once read in order to fix
      fate-h264-lossless (change by Hendrik)
    
    - H264Context.has_recovery_point and deprecated
      AVCodecContext.dtg_active_format are set after ff_h264_sei_decode()
      based on the SEI state since ff_h264_sei_decode() doesn't have access
      to H264Context anymore.
    
    - frame_packing_arrangement_type is not checked against <= 0 in
      decode_postinit() since it is always read as a positive value with
      get_bits(). This fixes a -Wtype-limits warning by GCC spotted by
      Michael.
    
    Side Notes:
    
    - tested that ffprobe on the file from ticket #3652 still returns 4
      keyframes
    - tested that playback from ticket #3063 still works
    Merged-by: 's avatarClément Bœsch <clement@stupeflix.com>
    Signed-off-by: 's avatarHendrik Leppkes <h.leppkes@gmail.com>
    5584f019
h264_direct.c 29.4 KB