ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Sat Apr 4
00:49:57 2015 +0200| [6da7625cc395692a71c99d179cb76eea6e8b27ca] | committer:
Michael Niedermayer
Merge commit 'a4d34e218f548d381e09c483e8dc6ad18a8d571c'
* commit 'a4d34e218f548d381e09c483e8dc6ad18a8d571c':
h264: disable ER by default
Conflicts:
libavcodec/h264.c
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=6da7625cc395692a71c99d179cb76eea6e8b27ca
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
