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)
commit621450e786c66b84626f0c7bafcfff6bed330e5d
tree3d7f9940c63287e5ce014097697f0319d9062335
parent9b41bf5c3dcefb95c8329e699f4bdb71ad267e6f
parent48183b3ad45c95e386a4cb02e1a68b53e6835ac5
Merge commit '48183b3ad45c95e386a4cb02e1a68b53e6835ac5'

* commit '48183b3ad45c95e386a4cb02e1a68b53e6835ac5':
  rtpdec_h264: Generalize parse_sprop_parameter_sets

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