[FFmpeg-cvslog] Merge commit '0b5af5cf1224add1769b1094b9924ecf10de3d7d'
Michael Niedermayer
git at videolan.org
Mon Aug 26 14:14:42 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug 26 13:57:01 2013 +0200| [b32a6da100a55f35b7dcb9577270b48d2fff4ef9] | committer: Michael Niedermayer
Merge commit '0b5af5cf1224add1769b1094b9924ecf10de3d7d'
* commit '0b5af5cf1224add1769b1094b9924ecf10de3d7d':
mov: Refactor multiple stsd skipping in mov_mov_skip_multiple_stsd
Conflicts:
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b32a6da100a55f35b7dcb9577270b48d2fff4ef9
---
More information about the ffmpeg-cvslog
mailing list