Merge commit 'b8df0b71c525e9fc9fbee790d093bae3aa62035c'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 15 Feb 2015 19:49:16 +0000 (20:49 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 15 Feb 2015 19:49:21 +0000 (20:49 +0100)
* commit 'b8df0b71c525e9fc9fbee790d093bae3aa62035c':
  rtp: h264: Move profile_level_id parsing to a function

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

Simple merge