diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-13 15:00:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-13 15:01:39 +0200 |
| commit | b4ca1b159f4b7f0c3d1e4b2deab686bda934f3a2 (patch) | |
| tree | 519a70950e58fd451aad4bffb53b987a2482068a /Makefile | |
| parent | d6c342fdc0b434b514f99e1feaa108ab17bba806 (diff) | |
| parent | bc4620e5d61a4dd9a1f654fadd281a172aab04be (diff) | |
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>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions