ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Sat Mar 21
20:00:34 2015 +0100| [830e548b9ec32ad7ab02be056db15cbcf3c58346] | committer:
Michael Niedermayer
Merge commit '582683b6ac798ed2a004a4e2121b7bd47892bbfd'
* commit '582683b6ac798ed2a004a4e2121b7bd47892bbfd':
h264: move remaining ER stuff into the per-slice context
Conflicts:
libavcodec/h264.h
libavcodec/h264_picture.c
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=830e548b9ec32ad7ab02be056db15cbcf3c58346
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
