[FFmpeg-cvslog] Merge commit 'd8520d3ee032bf18f28897e0109f44b405caf5e3'
Michael Niedermayer
git at videolan.org
Sat Jul 26 02:53:50 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jul 26 02:47:04 2014 +0200| [7295ee7f51d9567526537228f2a0cd47c11db9c3] | committer: Michael Niedermayer
Merge commit 'd8520d3ee032bf18f28897e0109f44b405caf5e3'
* commit 'd8520d3ee032bf18f28897e0109f44b405caf5e3':
mpegvideo: Move QMAT_SHIFT* defines to the only place they are used
Conflicts:
libavcodec/mpegvideo.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7295ee7f51d9567526537228f2a0cd47c11db9c3
---
More information about the ffmpeg-cvslog
mailing list