Merge commit '0752f700d63f6b15ffd5369ac7615414cce71247'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 21:19:02 +0000 (22:19 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 21:19:06 +0000 (22:19 +0100)
commita4f50ec9ddaa160c6c545635523a2e91abc741c5
treecf6aee5e72c5d627360b5c79a43f1e563758a10a
parentae2a8d874236ea68181c409705df195f579d7d97
parent0752f700d63f6b15ffd5369ac7615414cce71247
Merge commit '0752f700d63f6b15ffd5369ac7615414cce71247'

* commit '0752f700d63f6b15ffd5369ac7615414cce71247':
  rtpdec_h264: Remove an unnecessary include

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