Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Jul 2011 23:50:43 +0000 (01:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Jul 2011 23:50:53 +0000 (01:50 +0200)
commit2dd2abe391ccf1b9140c6eea95767b5a8c503ddd
tree0b3886285001ed05025bd4a338f3a5105d0c7a8b
parent4105443872be75a8d1141facc43b54641304c722
parent2a11952f457658d58303c8e5b4e10fb4599eef4f
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h263dec: Propagate AV_LOG_ERRORs from slice decoding through frame decoding with sufficient error recognition
  x86: cabac: don't load/store context values in asm
  H.264: optimize CABAC x86 asm for Atom
  vp3/theora: flush after seek.
  doc/fftools-common-opts: wording fixes missing from the previous commit.
  doc: document using AVOptions in fftools.
  cmdutils: add codec_opts parameter to setup_find_stream_info_opts()
  cmdutils: clarify documentation for filter_codec_opts()
  cmdutils: clarify documentation for setup_find_stream_info_opts()
  lavf: add forgotten attribute_deprecated to av_find_stream_info()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
13 files changed:
cmdutils.c
cmdutils.h
doc/ffmpeg.texi
doc/fftools-common-opts.texi
ffmpeg.c
ffplay.c
libavcodec/avcodec.h
libavcodec/h263dec.c
libavcodec/h264_cabac.c
libavcodec/options.c
libavcodec/vp3.c
libavcodec/x86/h264_i386.h
libavformat/avformat.h