Merge commit 'c82bf15dca00f67a701d126e47ea9075fc9459cb'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 22:30:51 +0000 (23:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 22:30:51 +0000 (23:30 +0100)
commitcf95877474ad8add55126db746f6818b47f71f37
tree266b74145fbdcc18260b68f87124a0a9bf133c1d
parent17773f49b7da49ceecc4b6260d5ded6938f9b163
parentc82bf15dca00f67a701d126e47ea9075fc9459cb
Merge commit 'c82bf15dca00f67a701d126e47ea9075fc9459cb'

* commit 'c82bf15dca00f67a701d126e47ea9075fc9459cb':
  rtpenc: Merge the h264 and hevc packetizers

Conflicts:
libavformat/rtpenc_hevc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/Makefile
libavformat/rtpenc.c
libavformat/rtpenc.h
libavformat/rtpenc_h264_hevc.c