[FFmpeg-cvslog] Merge commit 'a3b53ff062eaccdaa28964899c63520ef2978c2e'
Michael Niedermayer
git at videolan.org
Mon Aug 26 13:12:00 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug 26 13:04:39 2013 +0200| [bc6370b622276c5603d6e32e3939f8b7fb3a4b35] | committer: Michael Niedermayer
Merge commit 'a3b53ff062eaccdaa28964899c63520ef2978c2e'
* commit 'a3b53ff062eaccdaa28964899c63520ef2978c2e':
mov: Refactor video specific parsing in mov_parse_stsd_video
Conflicts:
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bc6370b622276c5603d6e32e3939f8b7fb3a4b35
---
More information about the ffmpeg-cvslog
mailing list