• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 7d8f1158
    Michael Niedermayer authored
    * qatar/master:
      mpegenc: use avctx->slices as number of slices
      v410enc: fix undefined signed left shift caused by integer promotion
      Release notes: mention cleaned up header includes
      fix Changelog file
      Fix a bunch of typos.
      Drop some pointless void* return value casts from av_malloc() invocations.
      wavpack: fix typos in previous cosmetic clean-up commit
      wavpack: cosmetics: K&R pretty-printing
      avconv: remove the 'codec framerate is different from stream' warning
      wavpack: determine sample_fmt before requesting a buffer
      bmv audio: implement new audio decoding API
      mpegaudiodec: skip all channels when skipping granules
      mpegenc: simplify muxrate calculation
    
    Conflicts:
    	Changelog
    	avconv.c
    	doc/RELEASE_NOTES
    	libavcodec/h264.c
    	libavcodec/mpeg12.c
    	libavcodec/mpegaudiodec.c
    	libavcodec/mpegvideo.c
    	libavformat/mpegenc.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    7d8f1158
postprocess_template.c 157 KB