[FFmpeg-cvslog] Merge commit 'dd2d3b766b20196d0b65a82e3d897ccecbf7adb8'
Michael Niedermayer
git at videolan.org
Mon May 12 00:29:38 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May 12 00:21:44 2014 +0200| [2ec4586d77c18eff38c128936a67b7d7a2e7f9a0] | committer: Michael Niedermayer
Merge commit 'dd2d3b766b20196d0b65a82e3d897ccecbf7adb8'
* commit 'dd2d3b766b20196d0b65a82e3d897ccecbf7adb8':
lavc: Add hwaccel private data and init/uninit callbacks
Conflicts:
libavcodec/avcodec.h
libavcodec/internal.h
libavcodec/pthread_frame.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2ec4586d77c18eff38c128936a67b7d7a2e7f9a0
---
More information about the ffmpeg-cvslog
mailing list