From: Michael Niedermayer Date: Sun, 15 Feb 2015 20:20:25 +0000 (+0100) Subject: Merge commit '53367b34e1156614e82ef7af888928f322566f88' X-Git-Tag: n2.6~500 X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=f3b6a8f554e24e617f1428678bf5aafefc6b8fb9 Merge commit '53367b34e1156614e82ef7af888928f322566f88' * commit '53367b34e1156614e82ef7af888928f322566f88': rtp: h264: Drop the asserts Conflicts: libavformat/rtpdec_h264.c Merged-by: Michael Niedermayer --- f3b6a8f554e24e617f1428678bf5aafefc6b8fb9