diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 19:05:59 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 19:08:40 +0300 |
| commit | 3c831fba08698293034db5ecaf8d74aa5fe453f8 (patch) | |
| tree | 8e42a1e32c1f1a7b547855048a809f7e5468cece /libavcodec/version.h | |
| parent | a76440239428190a6a5b303f0e87a7e1ae2cc881 (diff) | |
| parent | e44b58924fe7b180bf8b0c277c15d1a58210a0e9 (diff) | |
Merge commit 'e44b58924fe7b180bf8b0c277c15d1a58210a0e9'
* commit 'e44b58924fe7b180bf8b0c277c15d1a58210a0e9':
lavc: deprecate unused AVCodecContext.stream_codec_tag
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/version.h')
| -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 7e51f3b39e..eafa12d43c 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -184,5 +184,8 @@ #ifndef FF_API_MPV_OPT #define FF_API_MPV_OPT (LIBAVCODEC_VERSION_MAJOR < 59) #endif +#ifndef FF_API_STREAM_CODEC_TAG +#define FF_API_STREAM_CODEC_TAG (LIBAVCODEC_VERSION_MAJOR < 59) +#endif #endif /* AVCODEC_VERSION_H */ |