Merge commit '9b7f932ee568cadfc0f556a061fcc00cb63f9780'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 15 Oct 2014 17:04:17 +0000 (19:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 15 Oct 2014 17:04:22 +0000 (19:04 +0200)
* commit '9b7f932ee568cadfc0f556a061fcc00cb63f9780':
  rtpdec_hevc: Parse out of band vps/sps/pps/sei from fmtp lines

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

Simple merge