[FFmpeg-cvslog] Merge commit 'f0259a587ee3419dd894873ea617b4c98eeaca1c'

Michael Niedermayer git at videolan.org
Fri Nov 22 12:01:47 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 22 11:55:56 2013 +0100| [fe540ae6b72a20e84f828b2e37a0a538631b4049] | committer: Michael Niedermayer

Merge commit 'f0259a587ee3419dd894873ea617b4c98eeaca1c'

* commit 'f0259a587ee3419dd894873ea617b4c98eeaca1c':
  h264: check buffer size before accessing it

Conflicts:
	libavcodec/h264.c

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

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





More information about the ffmpeg-cvslog mailing list