ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Wed Jan 28
20:37:28 2015 +0100| [0b4fc4bacd866b14b74bcfb1656a1f469da6ad46] | committer:
Michael Niedermayer
Merge commit '3c18a7b18807de81566381a1bcbe9f6103c0296b'
* commit '3c18a7b18807de81566381a1bcbe9f6103c0296b':
avio: Do not consider the end-of-buffer position valid
Conflicts:
libavformat/aviobuf.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0b4fc4bacd866b14b74bcfb1656a1f469da6ad46
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
