Merge commit 'ddf5fb71ee9c8b2d9a23c0f661a84896cd7050fc'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 24 Sep 2014 22:15:26 +0000 (00:15 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 24 Sep 2014 22:17:36 +0000 (00:17 +0200)
* commit 'ddf5fb71ee9c8b2d9a23c0f661a84896cd7050fc':
  rtpenc: HEVC/H.265 support

Conflicts:
Changelog
libavformat/rtpenc.c
libavformat/rtpenc_hevc.c
libavformat/version.h

See: 6821a5a4adcb40c458356e8bb90416dd8f5dd6b2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/rtpenc.c
libavformat/rtpenc_hevc.c
libavformat/sdp.c
libavformat/version.h

Simple merge
Simple merge
Simple merge
index 61decb94a342113f1b862db32ecfc8e5e9c9b991,688c84a50ecef403c896c4150c0c8454300492bb..b1dde2c061cc01cbd56996b5183967ae5b480973
@@@ -30,8 -30,8 +30,8 @@@
  #include "libavutil/version.h"
  
  #define LIBAVFORMAT_VERSION_MAJOR 56
- #define LIBAVFORMAT_VERSION_MINOR  4
- #define LIBAVFORMAT_VERSION_MICRO 103
+ #define LIBAVFORMAT_VERSION_MINOR  5
 -#define LIBAVFORMAT_VERSION_MICRO  0
++#define LIBAVFORMAT_VERSION_MICRO 100
  
  #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                 LIBAVFORMAT_VERSION_MINOR, \