Merge commit '04a1be8e28e81f3967eace7705343c450616cc95'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 20:50:32 +0000 (21:50 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 20:55:46 +0000 (21:55 +0100)
commit8c1c06937156fb8dba1f1266b985f8671c29f4e2
tree9df1100e69b52f6e0567c52e9cd64db9fd692cdb
parentc6792275f43cdf1fc42f1cf4bd37c4595b048180
parent04a1be8e28e81f3967eace7705343c450616cc95
Merge commit '04a1be8e28e81f3967eace7705343c450616cc95'

* commit '04a1be8e28e81f3967eace7705343c450616cc95':
  libavformat: add T.140 RTP depacketization (RFC 4103)

Conflicts:
libavformat/rtpdec.c
libavformat/version.h

See: af940e6cb1212d4338e55c03498ef5ae40e6e749
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
libavformat/rtpdec.c
libavformat/version.h