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)
* commit 'a9a0b8d6c14ece1b4698c6ede9227aca980f6c5b':
  rtp: h264: Move parse_sprop_parameter_sets parsing to a function

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

Simple merge