[FFmpeg-cvslog] Merge commit '64c81b2cd0dcf1fe66c381a5d2c707dddcf35a7e'
Michael Niedermayer
git at videolan.org
Sat Mar 21 14:14:43 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 21 13:58:11 2015 +0100| [6ec279b54c09f47208930021a38a742f2cc09324] | committer: Michael Niedermayer
Merge commit '64c81b2cd0dcf1fe66c381a5d2c707dddcf35a7e'
* commit '64c81b2cd0dcf1fe66c381a5d2c707dddcf35a7e':
h264: move *_samples_available into the per-slice context
Conflicts:
libavcodec/h264.c
libavcodec/h264_mb.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6ec279b54c09f47208930021a38a742f2cc09324
---
More information about the ffmpeg-cvslog
mailing list