• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · b7fe35c9
    Michael Niedermayer authored
    * qatar/master:
      h264: deMpegEncContextize
    
    Conflicts:
    	libavcodec/dxva2_h264.c
    	libavcodec/h264.c
    	libavcodec/h264.h
    	libavcodec/h264_cabac.c
    	libavcodec/h264_cavlc.c
    	libavcodec/h264_loopfilter.c
    	libavcodec/h264_mb_template.c
    	libavcodec/h264_parser.c
    	libavcodec/h264_ps.c
    	libavcodec/h264_refs.c
    	libavcodec/h264_sei.c
    	libavcodec/svq3.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    b7fe35c9
h264_mb_template.c 16.7 KB