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 /libavcodec | |
| parent | d6c342fdc0b434b514f99e1feaa108ab17bba806 (diff) | |
| parent | bc4620e5d61a4dd9a1f654fadd281a172aab04be (diff) | |
| download | ffmpeg-b4ca1b159f4b7f0c3d1e4b2deab686bda934f3a2.tar.gz | |
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 'libavcodec')
| -rw-r--r-- | libavcodec/version.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h index 506f9f83f6..daafb019e7 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -97,5 +97,8 @@ #ifndef FF_API_AVCODEC_RESAMPLE #define FF_API_AVCODEC_RESAMPLE (LIBAVCODEC_VERSION_MAJOR < 55) #endif +#ifndef FF_API_LIBMPEG2 +#define FF_API_LIBMPEG2 (LIBAVCODEC_VERSION_MAJOR < 55) +#endif #endif /* AVCODEC_VERSION_H */ |