Merge commit '4438d1c6ede3190d7920513272fb9dc5371648f2'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Feb 2015 23:33:36 +0000 (00:33 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Feb 2015 23:36:53 +0000 (00:36 +0100)
* commit '4438d1c6ede3190d7920513272fb9dc5371648f2':
  rtsp: parse lang attribute in SDP

Conflicts:
libavformat/rtsp.h
libavformat/version.h

See: c7ad1f562b0fe46b77a8a9987a0d3512fc8197ea
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/version.h

index 94694cc..9cc393e 100644 (file)
@@ -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, \