• Michael Niedermayer's avatar
    Merge commit '8c02adc6' · 6e8e9f1e
    Michael Niedermayer authored
    * commit '8c02adc6':
      lavu: add all color-related enums to AVFrame
    
    Conflicts:
    	libavcodec/avcodec.h
    	libavutil/frame.c
    	libavutil/frame.h
    	libavutil/version.h
    
    The version check is changed so they are available with the current ABI
    FFmpeg libs should have no problems with added fields, nor should any
    application using the libs, and we regularly added fields in the past.
    We also moved 2 of these fields to AVFrame already previously without issues.
    
    See: a80e6229Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    6e8e9f1e
version.h 4.62 KB