[FFmpeg-cvslog] Merge commit '676856204b84dfaffe329dce8502e834a0dbdb19'
Michael Niedermayer
git at videolan.org
Fri Apr 11 14:38:54 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 11 14:28:19 2014 +0200| [ee2a43798c2a8e3f78806da4cfd41d390c39e115] | committer: Michael Niedermayer
Merge commit '676856204b84dfaffe329dce8502e834a0dbdb19'
* commit '676856204b84dfaffe329dce8502e834a0dbdb19':
DNxHD: make get_pixel_8x4_sym accept ptrdiff_t as stride
Conflicts:
libavcodec/dnxhdenc.h
libavcodec/x86/dnxhdenc_init.c
See: cb11b9e89e152ed4db22e5ad0349b63fac02101e
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ee2a43798c2a8e3f78806da4cfd41d390c39e115
---
More information about the ffmpeg-cvslog
mailing list