diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-22 00:46:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-22 00:48:27 +0100 |
| commit | 17384b1719807b42943bc8e481133d34fb05d9a5 (patch) | |
| tree | a99df30eb2e9aced570bab58b18d818f2f9931e1 /libavformat/version.h | |
| parent | 285eea00013f774cc935137a2e73a8f6ffb4e236 (diff) | |
| parent | 5e5583efe41662294c5e1b76499ba338557f808d (diff) | |
| download | ffmpeg-17384b1719807b42943bc8e481133d34fb05d9a5.tar.gz | |
Merge commit '5e5583efe41662294c5e1b76499ba338557f808d'
* commit '5e5583efe41662294c5e1b76499ba338557f808d':
libavformat: add AC3 RTP depacketization (RFC 4184)
Conflicts:
Changelog
libavformat/rtpdec_ac3.c
libavformat/version.h
See: 3eec775b211c5fd00300e2042ae8f116293e5d55
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/version.h')
| -rw-r--r-- | libavformat/version.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/version.h b/libavformat/version.h index 9cc393e4d8..5f9eccc45b 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -30,8 +30,9 @@ #include "libavutil/version.h" #define LIBAVFORMAT_VERSION_MAJOR 56 + #define LIBAVFORMAT_VERSION_MINOR 23 -#define LIBAVFORMAT_VERSION_MICRO 101 +#define LIBAVFORMAT_VERSION_MICRO 102 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |