Merge commit 'a4d34e218f548d381e09c483e8dc6ad18a8d571c'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 3 Apr 2015 22:49:57 +0000 (00:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 3 Apr 2015 22:52:54 +0000 (00:52 +0200)
commit6da7625cc395692a71c99d179cb76eea6e8b27ca
treee9cc769a62e44a17288e89aab2139a91e4e79402
parent959894632ae67e356ede734e352eabda6bb55794
parenta4d34e218f548d381e09c483e8dc6ad18a8d571c
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 <michaelni@gmx.at>
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_picture.c
libavcodec/h264_slice.c