• Michael Niedermayer's avatar
    Merge commit '064698d3' · 5eb1704d
    Michael Niedermayer authored
    * commit '064698d3':
      Add HEVC decoder
    
    Conflicts:
    	Changelog
    	libavcodec/Makefile
    	libavcodec/allcodecs.c
    	libavcodec/hevc.c
    	libavcodec/hevc.h
    	libavcodec/hevc_cabac.c
    	libavcodec/hevc_filter.c
    	libavcodec/hevc_mvs.c
    	libavcodec/hevc_parser.c
    	libavcodec/hevc_ps.c
    	libavcodec/hevc_refs.c
    	libavcodec/hevc_sei.c
    	libavcodec/hevcdsp.c
    	libavcodec/hevcdsp_template.c
    	libavcodec/hevcpred.c
    	libavcodec/hevcpred_template.c
    	libavcodec/version.h
    
    cosmetics from hevc.h & hevc_ps.c mostly merged, other files left as they where in ffmpeg.
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    5eb1704d
utils.c 112 KB