ffmpeg | branch: master | Michael Niedermayer <[email protected]> | 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 <[email protected]>

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



_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to