[FFmpeg-cvslog] Merge commit 'f9279ee74936b4990fc46287c27816ef828cc06c'
Michael Niedermayer
git at videolan.org
Sat Mar 22 22:29:28 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 22 22:23:04 2014 +0100| [672c610d8439ec7e83ba1e1d0c5ca2388cfccfc3] | committer: Michael Niedermayer
Merge commit 'f9279ee74936b4990fc46287c27816ef828cc06c'
* commit 'f9279ee74936b4990fc46287c27816ef828cc06c':
dsputil: Move ff_zigzag_direct and ff_crop_tab declarations to mathops.h
Conflicts:
libavcodec/imgconvert.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=672c610d8439ec7e83ba1e1d0c5ca2388cfccfc3
---
More information about the ffmpeg-cvslog
mailing list