[FFmpeg-cvslog] Merge commit '09f3c937ed6fd7c5bd64450d45f73b0f4975f4c9'
Michael Niedermayer
git at videolan.org
Fri Sep 20 11:56:06 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Sep 20 11:43:32 2013 +0200| [018e0db5eff21d2b7e546bc63f4807dea782d00d] | committer: Michael Niedermayer
Merge commit '09f3c937ed6fd7c5bd64450d45f73b0f4975f4c9'
* commit '09f3c937ed6fd7c5bd64450d45f73b0f4975f4c9':
asfenc: remember send time and offset of the index entries
Conflicts:
libavformat/asfenc.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=018e0db5eff21d2b7e546bc63f4807dea782d00d
---
More information about the ffmpeg-cvslog
mailing list