diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-22 00:33:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-22 00:36:53 +0100 |
| commit | 285eea00013f774cc935137a2e73a8f6ffb4e236 (patch) | |
| tree | 9ab0bdf3a4500b002be619c35e76e8d2d2052ede | |
| parent | 1fa2d95f6beb31ee8e579a85d09daf84e2de3285 (diff) | |
| parent | 4438d1c6ede3190d7920513272fb9dc5371648f2 (diff) | |
| download | ffmpeg-285eea00013f774cc935137a2e73a8f6ffb4e236.tar.gz | |
Merge commit '4438d1c6ede3190d7920513272fb9dc5371648f2'
* commit '4438d1c6ede3190d7920513272fb9dc5371648f2':
rtsp: parse lang attribute in SDP
Conflicts:
libavformat/rtsp.h
libavformat/version.h
See: c7ad1f562b0fe46b77a8a9987a0d3512fc8197ea
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -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 94694cc6b9..9cc393e4d8 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 100 +#define LIBAVFORMAT_VERSION_MICRO 101 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |