Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 20 Nov 2011 01:46:06 +0000 (02:46 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 20 Nov 2011 01:46:06 +0000 (02:46 +0100)
commitdbb38bc389e1af5ed465ed370887d6af4da0cb40
tree8998bdad7433fa92d6008ebb8a096e9dd1460340
parent90c02ae1429b7f50cefdaeeca04b51f978cd1921
parent09d243ddd0d939e97f3fe0b7f27320763ee41493
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  swscale: Fix stack alignment for SSE
  avcodec: move some AVCodecContext fields to an internal struct.
  avcodec: use av_opt_set() instead of deprecated av_set_string3()
  avcodec: fix some const warnings
  avcodec: remove pointless AVOption, internal_buffer_count
  imgutils: Fix illegal read.

Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
14 files changed:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/h264.c
libavcodec/internal.h
libavcodec/mimic.c
libavcodec/mpegvideo.c
libavcodec/options.c
libavcodec/pthread.c
libavcodec/utils.c
libavcodec/version.h
libavcodec/vp3.c
libavcodec/vp8.c
libavutil/imgutils.c
libswscale/swscale_unscaled.c