[FFmpeg-cvslog] Merge commit '200e8ac92007bc2fe30da05d3bd00ab620842a6b'
Michael Niedermayer
git at videolan.org
Mon Jan 14 13:54:42 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 14 13:38:04 2013 +0100| [41bdef1d39584727c9deaa42b86d085138098231] | committer: Michael Niedermayer
Merge commit '200e8ac92007bc2fe30da05d3bd00ab620842a6b'
* commit '200e8ac92007bc2fe30da05d3bd00ab620842a6b':
vdpau: Add MPEG-4 decoding via hwaccel infrastructure
vdpau: Add MPEG-1/2 decoding via hwaccel infrastructure
Conflicts:
configure
libavcodec/Makefile
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=41bdef1d39584727c9deaa42b86d085138098231
---
More information about the ffmpeg-cvslog
mailing list