Merge commit 'a505c0d7'
* commit 'a505c0d7': rtp: Initial H.261 support Conflicts: Changelog libavformat/rtpdec_h261.c libavformat/rtpenc_h261.c libavformat/sdp.c libavformat/version.h See: 50a4d5cfMerged-by: Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment