• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 3ba0bfe7
    Michael Niedermayer authored
    * qatar/master:
      ulti: Fix invalid reads
      lavf: dealloc private options in av_write_trailer
      yadif: support 10bit YUV
      vc1: mark with ER_MB_ERROR bits overconsumption
      lavc: introduce ER_MB_END and ER_MB_ERROR
      error_resilience: use the ER_ namespace
      build: move inclusion of subdir.mak to main subdir loop
      rv34: NEON optimised 4x4 dequant
      rv34: move 4x4 dequant to RV34DSPContext
      aacdec: Use intfloat.h rather than local punning union.
    
    Conflicts:
    	libavcodec/h264.c
    	libavcodec/vc1dec.c
    	libavfilter/vf_yadif.c
    	libavformat/Makefile
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    3ba0bfe7
Makefile 111 Bytes