diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-11-29 15:26:51 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-11-29 15:26:51 +0100 |
| commit | 93fb4a46298c5dc456154b0eb594b8a704e366cd (patch) | |
| tree | 855235c037579d68bc4ed8c3764872ea1e9b53ec /libavcodec/version.h | |
| parent | da7cfef7f0c98c05571c62d344aad83e0e85d0fb (diff) | |
| parent | 462a54e2291e1fa18e1f1254d09739dfbb795617 (diff) | |
| download | ffmpeg-streaming-93fb4a46298c5dc456154b0eb594b8a704e366cd.zip ffmpeg-streaming-93fb4a46298c5dc456154b0eb594b8a704e366cd.tar.gz | |
Merge commit '462a54e2291e1fa18e1f1254d09739dfbb795617'
* commit '462a54e2291e1fa18e1f1254d09739dfbb795617':
lavc: Deprecate avctx.rtp_callback field
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/version.h')
| -rw-r--r-- | libavcodec/version.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h index 5eecf5b..d1d89a1 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #define LIBAVCODEC_VERSION_MAJOR 57 #define LIBAVCODEC_VERSION_MINOR 16 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ @@ -194,5 +194,8 @@ #ifndef FF_API_AVPACKET_OLD_API #define FF_API_AVPACKET_OLD_API (LIBAVCODEC_VERSION_MAJOR < 59) #endif +#ifndef FF_API_RTP_CALLBACK +#define FF_API_RTP_CALLBACK (LIBAVCODEC_VERSION_MAJOR < 59) +#endif #endif /* AVCODEC_VERSION_H */ |
