[FFmpeg-cvslog] Merge commit 'dd0bfc3a6a310e3e3674ce7742672d689a9a0e93'

Michael Niedermayer git at videolan.org
Sun Jul 21 12:08:24 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jul 21 11:55:51 2013 +0200| [0a28a52d53e20e45d8ca8c977984742b15b774f8] | committer: Michael Niedermayer

Merge commit 'dd0bfc3a6a310e3e3674ce7742672d689a9a0e93'

* commit 'dd0bfc3a6a310e3e3674ce7742672d689a9a0e93':
  dsicinav: Bound-check the source buffer when needed

Conflicts:
	libavcodec/dsicinav.c

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

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





More information about the ffmpeg-cvslog mailing list