[FFmpeg-cvslog] Merge commit 'e62a43f6b1a9c0c82e1df33c0c038e32029c0aa4'
Michael Niedermayer
git at videolan.org
Fri Nov 29 22:58:38 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 29 22:44:27 2013 +0100| [e2f63be01284024a39a97dff9237eb4cbbb5dbbf] | committer: Michael Niedermayer
Merge commit 'e62a43f6b1a9c0c82e1df33c0c038e32029c0aa4'
* commit 'e62a43f6b1a9c0c82e1df33c0c038e32029c0aa4':
mpeg4videodec: move MpegEncContext.time_increment_bits to Mpeg4DecContext
Conflicts:
libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e2f63be01284024a39a97dff9237eb4cbbb5dbbf
---
More information about the ffmpeg-cvslog
mailing list