Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 23 Jul 2011 14:47:10 +0000 (16:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 23 Jul 2011 14:47:10 +0000 (16:47 +0200)
commit5271b857ebc7ddcfa2d0dc6604f55ef43d2bc49e
tree38b5f7b209f392584c6829a0dd1fd84a9b70bec1
parentcc0dc50d027b8aca27b07ef5cededde2e9d96d57
parentb4cfb8254eeeb2fc0aa2c0c36a5ede208af47a79
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dnxhddec: avoid a branch in 10-bit decode_dct_block()
  H.264: Add optimizations to predict x86 assembly.
  riff: Add mpgv MPEG-2 fourcc
  add Flash Screen Video 2 decoder

Conflicts:
configure
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
configure
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/dnxhddec.c
libavcodec/flashsv.c
libavcodec/version.h
libavcodec/x86/h264_intrapred.asm
libavcodec/x86/h264_intrapred_init.c
libavformat/riff.c