[FFmpeg-cvslog] Merge commit 'ae9d13f03e6c81ea00fafe6aa74b4a849ec8da1a'
Michael Niedermayer
git at videolan.org
Thu Dec 12 19:54:42 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Dec 12 19:48:36 2013 +0100| [2644df82e6b3610eaf374352ed981bc5d48d2762] | committer: Michael Niedermayer
Merge commit 'ae9d13f03e6c81ea00fafe6aa74b4a849ec8da1a'
* commit 'ae9d13f03e6c81ea00fafe6aa74b4a849ec8da1a':
img2: add stereo 3d still picture file extensions
Conflicts:
libavformat/img2.c
See: 6fe12c7ff2094c68a8b6e9aeea7744ca15594091
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2644df82e6b3610eaf374352ed981bc5d48d2762
---
More information about the ffmpeg-cvslog
mailing list