[FFmpeg-cvslog] Merge commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 13 15:00:13 2012 +0200| [b4ca1b159f4b7f0c3d1e4b2deab686bda934f3a2] | committer: Michael Niedermayer

Merge commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be'

* commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be':
  Remove libmpeg2 #define remnants
  De-doxygenize some top-level files

Conflicts:
	ffmpeg.c
	ffmpeg.h
	ffmpeg_filter.c
	ffplay.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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