[FFmpeg-cvslog] Merge commit 'a1c5cc429d99216406170eac7e8352860076d3e8'
Michael Niedermayer
git at videolan.org
Mon Oct 28 14:20:22 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Oct 28 13:55:06 2013 +0100| [17e47ec8be200d54aa7ef31994e1ba5ea5f32622] | committer: Michael Niedermayer
Merge commit 'a1c5cc429d99216406170eac7e8352860076d3e8'
* commit 'a1c5cc429d99216406170eac7e8352860076d3e8':
lavc: don't set AVFrame.pts to random numbers in decoders.
Conflicts:
libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=17e47ec8be200d54aa7ef31994e1ba5ea5f32622
---
More information about the ffmpeg-cvslog
mailing list