ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Sat Mar 21
16:10:31 2015 +0100| [db4234c5002fc0ac7ecae323874b97a4547ae0c3] | committer:
Michael Niedermayer
Merge commit '07c5ca551b7327d3c4e33738cc0cd2d5ac2779fa'
* commit '07c5ca551b7327d3c4e33738cc0cd2d5ac2779fa':
h264: move is_complex into the per-slice context
Conflicts:
libavcodec/h264_slice.c
libavcodec/svq3.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=db4234c5002fc0ac7ecae323874b97a4547ae0c3
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
