Merge commit 'a9a0b8d6c14ece1b4698c6ede9227aca980f6c5b'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 15 Feb 2015 19:57:45 +0000 (20:57 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 15 Feb 2015 19:57:49 +0000 (20:57 +0100)
commit8f00d7f4b4019c91c980930a0a57d1e72b479c96
tree6f24ac74a3d333c832f6746c76f69cb1830b0abd
parent3773b6edea6f40a4e3ee4814a88d74339da4d22b
parenta9a0b8d6c14ece1b4698c6ede9227aca980f6c5b
Merge commit 'a9a0b8d6c14ece1b4698c6ede9227aca980f6c5b'

* commit 'a9a0b8d6c14ece1b4698c6ede9227aca980f6c5b':
  rtp: h264: Move parse_sprop_parameter_sets parsing to a function

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