-
Michael Niedermayer authored
* commit 'ddf5fb71': rtpenc: HEVC/H.265 support Conflicts: Changelog libavformat/rtpenc.c libavformat/rtpenc_hevc.c libavformat/version.h See: 6821a5a4Merged-by: Michael Niedermayer <michaelni@gmx.at>
d8ddac36
* commit 'ddf5fb71': rtpenc: HEVC/H.265 support Conflicts: Changelog libavformat/rtpenc.c libavformat/rtpenc_hevc.c libavformat/version.h See: 6821a5a4Merged-by: Michael Niedermayer <michaelni@gmx.at>