Merge commit 'a505c0d7373336a4cc5aa2022111c46bdd388b1f'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 01:33:15 +0000 (02:33 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 01:34:17 +0000 (02:34 +0100)
commit5162af67f41214edacefe05d9723e4a6d9847900
treee07706bd952bc563e0b56adc26199675e19238d1
parent3f5d1c8130b1326d779c4216886272a3efce816a
parenta505c0d7373336a4cc5aa2022111c46bdd388b1f
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: 50a4d5cfc6749932347ee38c25b5040aea4b13a0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
libavformat/rtpdec_formats.h
libavformat/rtpdec_h261.c
libavformat/rtpenc.c
libavformat/rtpenc_h261.c
libavformat/sdp.c
libavformat/version.h