[FFmpeg-cvslog] Merge commit '3dc6272bed7890a49080e18eacf3c7a4a6594b0d'
Michael Niedermayer
git at videolan.org
Sat Apr 5 19:05:18 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Apr 5 18:48:42 2014 +0200| [5440151fa42d4e18c83bc42ff31526680697e645] | committer: Michael Niedermayer
Merge commit '3dc6272bed7890a49080e18eacf3c7a4a6594b0d'
* commit '3dc6272bed7890a49080e18eacf3c7a4a6594b0d':
Remove a number of unnecessary dsputil.h #includes
Conflicts:
libavcodec/h264pred.c
libavcodec/vc1dsp.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5440151fa42d4e18c83bc42ff31526680697e645
---
More information about the ffmpeg-cvslog
mailing list