ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Fri Dec 19
04:53:39 2014 +0100| [76a8127a452f9e149a876c5fa6d6f0634e3b5b1e] | committer:
Michael Niedermayer
Merge commit '9745f19ffc9031ce480e43d7cf1053b58100d70f'
* commit '9745f19ffc9031ce480e43d7cf1053b58100d70f':
assdec: check the right variable
Conflicts:
libavcodec/assdec.c
See: cc7342f712c0822c3e8f4c36fc55632c59aabac9
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=76a8127a452f9e149a876c5fa6d6f0634e3b5b1e
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
