[FFmpeg-cvslog] Merge commit 'b063582e0c4f775a8ba377488bd085595e0e7fae'
Michael Niedermayer
git at videolan.org
Sat Mar 21 15:44:21 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 21 15:25:31 2015 +0100| [35a788d953838c1b7f34038ef54fddc3d11994fe] | committer: Michael Niedermayer
Merge commit 'b063582e0c4f775a8ba377488bd085595e0e7fae'
* commit 'b063582e0c4f775a8ba377488bd085595e0e7fae':
h264: move intra_pcm_ptr into the per-slice context
Conflicts:
libavcodec/h264.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=35a788d953838c1b7f34038ef54fddc3d11994fe
---
More information about the ffmpeg-cvslog
mailing list