[FFmpeg-cvslog] Merge commit 'a312f71090ee620ee252f2034aef6b13e2dafe9c'
Michael Niedermayer
git at videolan.org
Mon May 19 18:49:12 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May 19 18:38:10 2014 +0200| [999a99c865cc12cc69240029b8a280b5ba170b52] | committer: Michael Niedermayer
Merge commit 'a312f71090ee620ee252f2034aef6b13e2dafe9c'
* commit 'a312f71090ee620ee252f2034aef6b13e2dafe9c':
lavf: deprecate now unused AVStream.pts
Conflicts:
libavformat/mux.c
libavformat/version.h
mostly not merged as the code is needed for a/vsync drop handling
and what the code does is what is needed, it could maybe be moved
elsewhere or factored somehow but simply removing it would be droping
these features.
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=999a99c865cc12cc69240029b8a280b5ba170b52
---
More information about the ffmpeg-cvslog
mailing list