ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Tue Oct 14
03:00:17 2014 +0200| [4694c0bb7c5ac3a9b87ab9682e2cc076b00a82f7] | committer:
Michael Niedermayer
Merge commit 'eabdc2a830f1ab1a3f12243eb7e2fba801cb81f0'
* commit 'eabdc2a830f1ab1a3f12243eb7e2fba801cb81f0':
lavf: use initial_padding instead of deprecated delay
Conflicts:
libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4694c0bb7c5ac3a9b87ab9682e2cc076b00a82f7
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
