diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-04 13:23:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-04 13:23:19 +0100 |
| commit | 8d0b2aae71f01904e4a7ac0e8795592da5a0bd89 (patch) | |
| tree | e0bfc884210a851e22fd1acabb6b9e873cef5bb4 /libavformat/version.h | |
| parent | ea96feddb7bb813c1e0c9befe9c96bf73996f841 (diff) | |
| parent | e96406eda4f143f101bd44372f7b2d542183000a (diff) | |
Merge commit 'e96406eda4f143f101bd44372f7b2d542183000a'
* commit 'e96406eda4f143f101bd44372f7b2d542183000a':
rtsp: Add support for depacketizing RTP data via custom IO
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 890d8ef7e4..3b760bb311 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 102 +#define LIBAVFORMAT_VERSION_MICRO 103 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |