[FFmpeg-cvslog] Merge commit '86f042dcabde2a5386dbd95ab0451b274987d253'
Michael Niedermayer
git at videolan.org
Sat Jul 27 09:25:14 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jul 27 09:19:58 2013 +0200| [90279285227914dabf2cd011b186d2182291363a] | committer: Michael Niedermayer
Merge commit '86f042dcabde2a5386dbd95ab0451b274987d253'
* commit '86f042dcabde2a5386dbd95ab0451b274987d253':
wtv: Make WTV_SECTOR_BITS a 64 bit constant
Conflicts:
libavformat/wtv.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=90279285227914dabf2cd011b186d2182291363a
---
More information about the ffmpeg-cvslog
mailing list