Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 1 Nov 2012 12:25:46 +0000 (13:25 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 1 Nov 2012 12:25:46 +0000 (13:25 +0100)
commit7fd9d49ba7fa57629592b1f7064cb12d96984a14
tree5e28214b75e917193be3699941069c9bbb43ece4
parentadd7513e64e6db255e30fba544068ed2ab5e7b3e
parent6b07830a77729fe25c30026feabd53e8c4c5eb9e
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: add ac3/eac3 tests to FATE_SAMPLES_AVCONV
  avconv_opt, cmdutils: Add missing function parameter Doxygen
  x86: Move optimization suffix to end of function names

Conflicts:
cmdutils.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
cmdutils.h
ffmpeg_opt.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/h264_chromamc.asm