• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · b81f8880
    Michael Niedermayer authored
    * qatar/master: (23 commits)
      fix AC3ENC_OPT_MODE_ON/OFF
      h264: fix HRD parameters parsing
      prores: implement multithreading.
      prores: idct sse2/sse4 optimizations.
      swscale: use aligned move for storage into temporary buffer.
      prores: extract idct into its own dspcontext and merge with put_pixels.
      h264: fix invalid shifts in init_cavlc_level_tab()
      intfloat_readwrite: fix signed addition overflows
      mov: do not misreport empty stts
      mov: cosmetics, fix for and if spacing
      id3v2: fix NULL pointer dereference
      mov: read album_artist atom
      mov: fix disc/track numbers and totals
      doc: fix references to obsolete presets directories for avconv/ffmpeg
      flashsv: return more meaningful error value
      flashsv: fix typo in av_log() message
      smacker: validate channels and sample format.
      smacker: check buffer size before reading output size
      smacker: validate number of channels
      smacker: Separate audio flags from sample rates in smacker demuxer.
      ...
    
    Conflicts:
    	cmdutils.h
    	doc/ffmpeg.texi
    	libavcodec/Makefile
    	libavcodec/motion_est_template.c
    	libavformat/id3v2.c
    	libavformat/mov.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    b81f8880
scale.asm 13.9 KB