diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-24 23:50:32 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-24 23:55:46 +0300 |
| commit | 8c1c06937156fb8dba1f1266b985f8671c29f4e2 (patch) | |
| tree | 9df1100e69b52f6e0567c52e9cd64db9fd692cdb /libavformat/version.h | |
| parent | c6792275f43cdf1fc42f1cf4bd37c4595b048180 (diff) | |
| parent | 04a1be8e28e81f3967eace7705343c450616cc95 (diff) | |
Merge commit '04a1be8e28e81f3967eace7705343c450616cc95'
* commit '04a1be8e28e81f3967eace7705343c450616cc95':
libavformat: add T.140 RTP depacketization (RFC 4103)
Conflicts:
libavformat/rtpdec.c
libavformat/version.h
See: af940e6cb1212d4338e55c03498ef5ae40e6e749
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/version.h')
| -rw-r--r-- | libavformat/version.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/version.h b/libavformat/version.h index c23ce57d75..7ba19bc734 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #define LIBAVFORMAT_VERSION_MAJOR 56 #define LIBAVFORMAT_VERSION_MINOR 23 -#define LIBAVFORMAT_VERSION_MICRO 104 +#define LIBAVFORMAT_VERSION_MICRO 105 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |