Michael Niedermayer 5162af67f4 Merge commit 'a505c0d7373336a4cc5aa2022111c46bdd388b1f' ...

* commit 'a505c0d7373336a4cc5aa2022111c46bdd388b1f':
  rtp: Initial H.261 support

Conflicts:
	Changelog
	libavformat/rtpdec_h261.c
	libavformat/rtpenc_h261.c
	libavformat/sdp.c
	libavformat/version.h

See: 50a4d5cfc6
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-12-19 02:34:17 +01:00

22 KiB

Raw Blame History

View Raw