[FFmpeg-cvslog] Merge commit '53367b34e1156614e82ef7af888928f322566f88'

Michael Niedermayer git at videolan.org
Sun Feb 15 21:28:04 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb 15 21:20:25 2015 +0100| [f3b6a8f554e24e617f1428678bf5aafefc6b8fb9] | committer: Michael Niedermayer

Merge commit '53367b34e1156614e82ef7af888928f322566f88'

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

Conflicts:
	libavformat/rtpdec_h264.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f3b6a8f554e24e617f1428678bf5aafefc6b8fb9
---





More information about the ffmpeg-cvslog mailing list