• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 9e89bc37
    Michael Niedermayer authored
    * qatar/master:
      rtmp: Add support for SWFVerification
      api-example: use new video encoding API.
      x86: avcodec: Appropriately name files containing only init functions
      mpegvideo_mmx_template: drop some commented-out cruft
      libavresample: add mix level normalization option
      w32pthreads: Add missing #includes to make header compile standalone
      rtmp: Gracefully ignore _checkbw errors by tracking them
      rtmp: Do not send _checkbw calls as notifications
      prores: interlaced ProRes encoding
    
    Conflicts:
    	doc/examples/decoding_encoding.c
    	libavcodec/proresenc_kostya.c
    	libavcodec/w32pthreads.h
    	libavcodec/x86/Makefile
    	libavformat/version.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    9e89bc37
proresenc_kostya.c 35.8 KB