Merge commit 'f4b59334bd898c47c9ac30999a346176548630a8'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 23:17:44 +0000 (00:17 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 23:17:48 +0000 (00:17 +0100)
commit64f58d20b2008bd2c633beef3c21331dfff0d0e5
tree8197908f987545fc740c6fc34092e4c01d909fd3
parentf966ac2b6e3f08c41f3c45ab5efff768db62ac5a
parentf4b59334bd898c47c9ac30999a346176548630a8
Merge commit 'f4b59334bd898c47c9ac30999a346176548630a8'

* commit 'f4b59334bd898c47c9ac30999a346176548630a8':
  rtpdec: Remove the now unused .alloc field

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/rtpdec.h
libavformat/rtsp.c