• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 9621646e
    Michael Niedermayer authored
    * qatar/master:
      x86: dsputil: prettyprint gcc inline asm
      x86: K&R prettyprinting cosmetics for dsputil_mmx.c
      x86: conditionally compile H.264 QPEL optimizations
      dsputil_mmx: Surround QPEL macros by "do { } while (0);" blocks.
      Ignore generated files below doc/.
      dpcm: convert to bytestream2.
      interplayvideo: convert to bytestream2.
      movenc: Merge if statements
      h264: fix memleak in error path.
      pthread: Immediately release all frames in ff_thread_flush()
      h264: Add check for invalid chroma_format_idc
      utvideo: port header reading to bytestream2.
    
    Conflicts:
    	.gitignore
    	configure
    	libavcodec/h264_ps.c
    	libavcodec/interplayvideo.c
    	libavcodec/pthread.c
    	libavcodec/x86/dsputil_mmx.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    9621646e
movenc.c 119 KB