Merge commit '8bdbf49c6f4d9473183a3c45ec70d611eb6183cd'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Feb 2015 20:23:07 +0000 (21:23 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Feb 2015 20:23:16 +0000 (21:23 +0100)
commit2130ed3312d468fd3f6e299d35c013fe568b83ab
treea5514a958dc25b80a2a47a3c4b0de0c8bd955a29
parentde4ae9fb643e0258249165124dc87c60008574b8
parent8bdbf49c6f4d9473183a3c45ec70d611eb6183cd
Merge commit '8bdbf49c6f4d9473183a3c45ec70d611eb6183cd'

* commit '8bdbf49c6f4d9473183a3c45ec70d611eb6183cd':
  rtpdec_h264: Include the right header for AV_RB16

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