diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-25 01:30:51 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-25 01:30:51 +0300 |
commit | cf95877474ad8add55126db746f6818b47f71f37 (patch) | |
tree | 266b74145fbdcc18260b68f87124a0a9bf133c1d /libavformat/rtpdec_h263_rfc2190.c | |
parent | 17773f49b7da49ceecc4b6260d5ded6938f9b163 (diff) | |
parent | c82bf15dca00f67a701d126e47ea9075fc9459cb (diff) |
Merge commit 'c82bf15dca00f67a701d126e47ea9075fc9459cb'
* commit 'c82bf15dca00f67a701d126e47ea9075fc9459cb':
rtpenc: Merge the h264 and hevc packetizers
Conflicts:
libavformat/rtpenc_hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec_h263_rfc2190.c')
0 files changed, 0 insertions, 0 deletions