Merge commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 13 Oct 2012 13:00:13 +0000 (15:00 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 13 Oct 2012 13:01:39 +0000 (15:01 +0200)
commitb4ca1b159f4b7f0c3d1e4b2deab686bda934f3a2
tree519a70950e58fd451aad4bffb53b987a2482068a
parentd6c342fdc0b434b514f99e1feaa108ab17bba806
parentbc4620e5d61a4dd9a1f654fadd281a172aab04be
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>
ffmpeg.c
ffmpeg.h
ffmpeg_filter.c
ffmpeg_opt.c
ffplay.c
libavcodec/version.h