[FFmpeg-cvslog] Merge commit '34e7f70f9f493f340daab80eba4f12d005ec3e63' into release/2.4
Michael Niedermayer
git at videolan.org
Sun Jan 18 01:58:59 CET 2015
ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 18 01:40:31 2015 +0100| [6aece62b50cc19280213f91007cbf8d63a9f9432] | committer: Michael Niedermayer
Merge commit '34e7f70f9f493f340daab80eba4f12d005ec3e63' into release/2.4
* commit '34e7f70f9f493f340daab80eba4f12d005ec3e63':
assdec: check av_new_packet return value
Conflicts:
libavformat/assdec.c
See: 7c9f9685ae2d45d5bbb939483a01266622e8f14c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6aece62b50cc19280213f91007cbf8d63a9f9432
---
More information about the ffmpeg-cvslog
mailing list