diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-22 21:18:03 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-22 21:41:53 +0200 |
| commit | ee573b4d31d49280df0fbec61af6184130d26737 (patch) | |
| tree | 46f462f7e70dadd32d21e932449cd3124404a7a2 /libavcodec/version.h | |
| parent | 37498a4b202e332e690ba02b9ab04afcbb08c9a5 (diff) | |
| parent | a17a7661906ba295d67afd80ac0770422e1b02b3 (diff) | |
| download | ffmpeg-streaming-ee573b4d31d49280df0fbec61af6184130d26737.zip ffmpeg-streaming-ee573b4d31d49280df0fbec61af6184130d26737.tar.gz | |
Merge commit 'a17a7661906ba295d67afd80ac0770422e1b02b3'
* commit 'a17a7661906ba295d67afd80ac0770422e1b02b3':
lavc: Add data and linesize to AVSubtitleRect
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 b9aab44..ea0f0bd 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 8 +#define LIBAVCODEC_VERSION_MINOR 9 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ @@ -188,5 +188,8 @@ #ifndef FF_API_CONVERGENCE_DURATION #define FF_API_CONVERGENCE_DURATION (LIBAVCODEC_VERSION_MAJOR < 59) #endif +#ifndef FF_API_AVPICTURE +#define FF_API_AVPICTURE (LIBAVCODEC_VERSION_MAJOR < 59) +#endif #endif /* AVCODEC_VERSION_H */ |
