Merge commit '53367b34e1156614e82ef7af888928f322566f88'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 15 Feb 2015 20:20:25 +0000 (21:20 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 15 Feb 2015 20:20:25 +0000 (21:20 +0100)
* commit '53367b34e1156614e82ef7af888928f322566f88':
  rtp: h264: Drop the asserts

Conflicts:
libavformat/rtpdec_h264.c

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

Simple merge