diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-09 11:48:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-09 11:48:14 +0100 |
| commit | 34c1c08c665389daa190cb331e4d899da8dde57a (patch) | |
| tree | 4102f99b0b4cc834d0b9b6ccaef586753ad9c0f0 /libavformat/version.h | |
| parent | 8c3ae9ee66a2fb094b188c994a18df9f3e69a283 (diff) | |
| parent | 86d9181cf41edc3382bf2481f95a2fb321058689 (diff) | |
Merge commit '86d9181cf41edc3382bf2481f95a2fb321058689'
* commit '86d9181cf41edc3382bf2481f95a2fb321058689':
rtpdec: Support sending RTCP feedback packets
Conflicts:
libavformat/version.h
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 49cd01a9d8..e50e501462 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #define LIBAVFORMAT_VERSION_MAJOR 54 #define LIBAVFORMAT_VERSION_MINOR 59 -#define LIBAVFORMAT_VERSION_MICRO 106 +#define LIBAVFORMAT_VERSION_MICRO 107 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |