Merge commit '9a07c1332cfe092b57b5758f22b686ca58806c60'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 3 Nov 2012 13:13:45 +0000 (14:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 3 Nov 2012 13:13:45 +0000 (14:13 +0100)
commit1885ffb03d0af28e6bac2bcc8725fa15b93f6ac9
tree192b6341b447e51b2121dc17509ce852fa36405b
parentb91fa5fcca70bdf188b757084edd444d4d8530c9
parent9a07c1332cfe092b57b5758f22b686ca58806c60
Merge commit '9a07c1332cfe092b57b5758f22b686ca58806c60'

* commit '9a07c1332cfe092b57b5758f22b686ca58806c60':
  parser: Move Doxygen documentation to the header files
  PGS subtitles: Expose forced flag
  x86: PMINUB: port to cpuflags

Conflicts:
libavcodec/avcodec.h
libavcodec/pgssubdec.c
libavcodec/version.h
libavcodec/x86/ac3dsp.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/avcodec.h
libavcodec/dvdsubdec.c
libavcodec/options.c
libavcodec/parser.c
libavcodec/parser.h
libavcodec/pgssubdec.c
libavcodec/version.h
libavcodec/x86/ac3dsp.asm
libavutil/x86/x86util.asm