[FFmpeg-cvslog] Merge commit '9a07c1332cfe092b57b5758f22b686ca58806c60'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Nov  3 14:13:45 2012 +0100| [1885ffb03d0af28e6bac2bcc8725fa15b93f6ac9] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1885ffb03d0af28e6bac2bcc8725fa15b93f6ac9
---