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)
* commit '3b33dfb23c5022a0cb2a7b13878e4a3492a996c7':
  rtp: h264: Move FU-A NAL parsing to a function

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

Simple merge