Merge commit '3b33dfb23c5022a0cb2a7b13878e4a3492a996c7'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 15 Feb 2015 20:09:43 +0000 (21:09 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 15 Feb 2015 20:09:47 +0000 (21:09 +0100)
commita848cf63dcc1b3185f84f80ddbbf8f3a468f5cae
tree1d7ba082b241b837160a02b25906684d370ca367
parent2d2c744f8faaa2128edc5ec55c90ea94f2767733
parent3b33dfb23c5022a0cb2a7b13878e4a3492a996c7
Merge commit '3b33dfb23c5022a0cb2a7b13878e4a3492a996c7'

* commit '3b33dfb23c5022a0cb2a7b13878e4a3492a996c7':
  rtp: h264: Move FU-A NAL parsing to a function

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