• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 67f5650a
    Michael Niedermayer authored
    * qatar/master:
      rv34: add NEON rv34_idct_add
      rv34: 1-pass inter MB reconstruction
      add SMJPEG muxer
      avformat: split out common SMJPEG code
      pictordec: Use bytestream2 functions
      avconv: use avcodec_encode_audio2()
      pcmenc: use AVCodec.encode2()
      avcodec: bump minor version and add APIChanges for the new audio encoding API
      avcodec: Add avcodec_encode_audio2() as replacement for avcodec_encode_audio()
      avcodec: add a public function, avcodec_fill_audio_frame().
      rv34: Intra 16x16 handling
      rv34: Inter/intra MB code split
    
    Conflicts:
    	Changelog
    	libavcodec/avcodec.h
    	libavcodec/pictordec.c
    	libavcodec/utils.c
    	libavcodec/version.h
    	libavcodec/x86/rv34dsp.asm
    	libavformat/version.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    67f5650a
version.h 4.45 KB