diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-27 14:28:56 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-27 14:28:56 +0100 |
| commit | 7f5af80ba42bbd82da53dfd95236e9d47159a96a (patch) | |
| tree | f85abbee087fa12065f02278c710ea4830c2cae5 /libavcodec/version.h | |
| parent | 856b19d5935b544e96156f8e75e23b28c0a9f318 (diff) | |
| parent | ce70f28a1732c74a9cd7fec2d56178750bd6e457 (diff) | |
| download | ffmpeg-streaming-7f5af80ba42bbd82da53dfd95236e9d47159a96a.zip ffmpeg-streaming-7f5af80ba42bbd82da53dfd95236e9d47159a96a.tar.gz | |
Merge commit 'ce70f28a1732c74a9cd7fec2d56178750bd6e457'
* commit 'ce70f28a1732c74a9cd7fec2d56178750bd6e457':
avpacket: Replace av_free_packet with av_packet_unref
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 155b1c8..2724729 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 57 -#define LIBAVCODEC_VERSION_MINOR 11 +#define LIBAVCODEC_VERSION_MINOR 12 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ @@ -191,5 +191,8 @@ #ifndef FF_API_AVPICTURE #define FF_API_AVPICTURE (LIBAVCODEC_VERSION_MAJOR < 59) #endif +#ifndef FF_API_AVPACKET_OLD_API +#define FF_API_AVPACKET_OLD_API (LIBAVCODEC_VERSION_MAJOR < 59) +#endif #endif /* AVCODEC_VERSION_H */ |
