[FFmpeg-cvslog] Merge commit 'dc40d88625d7e402d58ac3f3df69fbf27aa31ea0'
Michael Niedermayer
git at videolan.org
Mon May 19 15:36:40 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May 19 15:13:16 2014 +0200| [2de2b991cac603cc6ad1ff94c706c64a2232f69b] | committer: Michael Niedermayer
Merge commit 'dc40d88625d7e402d58ac3f3df69fbf27aa31ea0'
* commit 'dc40d88625d7e402d58ac3f3df69fbf27aa31ea0':
avconv: do not use poorly defined and undocumented AVStream.pts
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2de2b991cac603cc6ad1ff94c706c64a2232f69b
---
More information about the ffmpeg-cvslog
mailing list