[FFmpeg-cvslog] Merge commit '256ef19844892c6cf8e0386e3287bae970ec6320'
Michael Niedermayer
git at videolan.org
Sat Jul 18 02:22:37 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sat Jul 18 02:12:27 2015 +0200| [c0894e62881480f2fdedc95a41101f1add03d419] | committer: Michael Niedermayer
Merge commit '256ef19844892c6cf8e0386e3287bae970ec6320'
* commit '256ef19844892c6cf8e0386e3287bae970ec6320':
h264: arm: use intra pred8x8 functions only for chroma_format_idc <= 1
Conflicts:
libavcodec/arm/h264pred_init_arm.c
See: 565cabf5c80b25d86c2e539afcb3b24024fbce0a
Merged-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c0894e62881480f2fdedc95a41101f1add03d419
---
More information about the ffmpeg-cvslog
mailing list