Michael Niedermayer b4ca1b159f 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@gmx.at>

2012-10-13 15:01:39 +02:00

108 KiB

Raw Blame History

View Raw