[FFmpeg-cvslog] Merge commit 'd258531502b24cb653204fe4f003c8815755bdc4'
Michael Niedermayer
git at videolan.org
Fri Aug 16 12:47:20 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug 16 12:38:12 2013 +0200| [1ef0b8f9cc072be5b70af100b6d63dbbcc9cc260] | committer: Michael Niedermayer
Merge commit 'd258531502b24cb653204fe4f003c8815755bdc4'
* commit 'd258531502b24cb653204fe4f003c8815755bdc4':
swscale: Mark a bunch of tables only used within one file static
Conflicts:
libswscale/swscale_unscaled.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1ef0b8f9cc072be5b70af100b6d63dbbcc9cc260
---
More information about the ffmpeg-cvslog
mailing list