[FFmpeg-cvslog] Merge commit 'fe0f4e56577a2dbd373bb50b0ae2d49e69d822fc'

Michael Niedermayer git at videolan.org
Tue Feb 17 22:55:06 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb 17 22:46:59 2015 +0100| [62aec0c2d5b3ee55dc376279307e31f0d72a7b03] | committer: Michael Niedermayer

Merge commit 'fe0f4e56577a2dbd373bb50b0ae2d49e69d822fc'

* commit 'fe0f4e56577a2dbd373bb50b0ae2d49e69d822fc':
  avpacket: Check buffer reference

Conflicts:
	libavcodec/avpacket.c

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

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





More information about the ffmpeg-cvslog mailing list