Merge commit '48183b3ad45c95e386a4cb02e1a68b53e6835ac5'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Feb 2015 11:25:04 +0000 (12:25 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Feb 2015 11:25:09 +0000 (12:25 +0100)
* commit '48183b3ad45c95e386a4cb02e1a68b53e6835ac5':
  rtpdec_h264: Generalize parse_sprop_parameter_sets

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

Simple merge