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)
commitf3b6a8f554e24e617f1428678bf5aafefc6b8fb9
treeb23011721cacbc4de55bdc385ab6c65f0fac5f0e
parenta848cf63dcc1b3185f84f80ddbbf8f3a468f5cae
parent53367b34e1156614e82ef7af888928f322566f88
Merge commit '53367b34e1156614e82ef7af888928f322566f88'

* commit '53367b34e1156614e82ef7af888928f322566f88':
  rtp: h264: Drop the asserts

Conflicts:
libavformat/rtpdec_h264.c

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