Merge commit '9bec3ca2b878c83d2337bc6095bd51c3e3f8eef0'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Oct 2014 01:12:10 +0000 (03:12 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Oct 2014 01:12:10 +0000 (03:12 +0200)
* commit '9bec3ca2b878c83d2337bc6095bd51c3e3f8eef0':
  rtmpproto: Add pause support

Conflicts:
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/rtmpproto.c
libavformat/version.h

Simple merge
index 62f1c26616d0f397f2e64bdae93b579ae3075322,8e083119e78fa1b2ee65e4a19eef7a391d0405dd..dfc0968e167a5b2ee09080d256bbf1a0d5ac2eb4
@@@ -30,8 -30,8 +30,8 @@@
  #include "libavutil/version.h"
  
  #define LIBAVFORMAT_VERSION_MAJOR 56
 -#define LIBAVFORMAT_VERSION_MINOR  6
 -#define LIBAVFORMAT_VERSION_MICRO  1
 +#define LIBAVFORMAT_VERSION_MINOR  9
- #define LIBAVFORMAT_VERSION_MICRO 100
++#define LIBAVFORMAT_VERSION_MICRO 101
  
  #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                 LIBAVFORMAT_VERSION_MINOR, \