Merge commit 'e72605f80bf5cbe32053a554ccc137e0a99cf3dd'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 21:42:00 +0000 (22:42 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 21:42:04 +0000 (22:42 +0100)
commit48e3cd4fcd49cd7663f56611e20abb5a860caeaa
tree9ce9f896a3f8c4028b7b4816e704ee877e77c31e
parent11fb6258582d31bebf50ae02fbc301bbac613c2d
parente72605f80bf5cbe32053a554ccc137e0a99cf3dd
Merge commit 'e72605f80bf5cbe32053a554ccc137e0a99cf3dd'

* commit 'e72605f80bf5cbe32053a554ccc137e0a99cf3dd':
  rtpdec: Allow allocating and freeing the private data without explicit functions

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