ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Sat Mar 21
16:54:48 2015 +0100| [72bec029ee18aada1c54101f4fa0aa991355321c] | committer:
Michael Niedermayer
Merge commit '7bbc254d646ed9cf6deffc3fda75ae6729f95979'
* commit '7bbc254d646ed9cf6deffc3fda75ae6729f95979':
h264: move resync_mb_{x,y} into the per-slice context
Conflicts:
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=72bec029ee18aada1c54101f4fa0aa991355321c
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
