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)
* commit 'f4b59334bd898c47c9ac30999a346176548630a8':
  rtpdec: Remove the now unused .alloc field

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

Simple merge
Simple merge