ffmpeg | branch: master | Hendrik Leppkes <[email protected]> | Mon Aug 10
11:23:21 2015 +0200| [7653ebfff6ea3f91ea81599ba8e2af922c510ecb] | committer:
Hendrik Leppkes
Merge commit '83f254e65f938657a4dbec711e4c94252a72daf9'
* commit '83f254e65f938657a4dbec711e4c94252a72daf9':
movenc: Rename reserved_moov_pos to reserved_header_pos
Conflicts:
libavformat/movenc.c
libavformat/movenc.h
Merged-by: Hendrik Leppkes <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7653ebfff6ea3f91ea81599ba8e2af922c510ecb
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
