Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Oct 2011 03:33:52 +0000 (05:33 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Oct 2011 03:40:57 +0000 (05:40 +0200)
commitb81f8880e010ccdef3604d9beb681d3c4c6a7bc0
tree0a6534f8fd2d53e84f6b5716047e473b1598cd3d
parentb75d89a4784e027cec99236d58e9bd4121ec4309
parent5f3fb599536dd5bceb1d45cb73cd0b0ce3e5560c
Merge remote-tracking branch 'qatar/master'

* 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: Michael Niedermayer <michaelni@gmx.at>
22 files changed:
libavcodec/Makefile
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/flashsv.c
libavcodec/golomb.h
libavcodec/h264_cavlc.c
libavcodec/h264_ps.c
libavcodec/motion_est.c
libavcodec/motion_est_template.c
libavcodec/mpegvideo.h
libavcodec/proresdec_lgpl.c
libavcodec/simple_idct.c
libavcodec/simple_idct.h
libavcodec/sipr.c
libavcodec/smacker.c
libavcodec/x86/Makefile
libavcodec/x86/dsputil_mmx.c
libavformat/id3v2.c
libavformat/mov.c
libavformat/smacker.c
libavutil/intfloat_readwrite.c
libswscale/x86/scale.asm