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)
commit2d2c744f8faaa2128edc5ec55c90ea94f2767733
tree01b2bd524480aa6259d6db32701f94772f9c585b
parent8f00d7f4b4019c91c980930a0a57d1e72b479c96
parentf0a87479960ce000f23f2beaf474707797b4b0d0
Merge commit 'f0a87479960ce000f23f2beaf474707797b4b0d0'

* commit 'f0a87479960ce000f23f2beaf474707797b4b0d0':
  rtp: h264: Move STAP-A NAL parsing to a function

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