Merge commit 'f0a87479960ce000f23f2beaf474707797b4b0d0'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 15 Feb 2015 20:03:43 +0000 (21:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 15 Feb 2015 20:03:47 +0000 (21:03 +0100)
* commit 'f0a87479960ce000f23f2beaf474707797b4b0d0':
  rtp: h264: Move STAP-A NAL parsing to a function

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

Simple merge