diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-04 00:49:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-04 00:52:54 +0200 |
| commit | 6da7625cc395692a71c99d179cb76eea6e8b27ca (patch) | |
| tree | e9cc769a62e44a17288e89aab2139a91e4e79402 /libswresample | |
| parent | 959894632ae67e356ede734e352eabda6bb55794 (diff) | |
| parent | a4d34e218f548d381e09c483e8dc6ad18a8d571c (diff) | |
| download | ffmpeg-6da7625cc395692a71c99d179cb76eea6e8b27ca.tar.gz | |
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>
Diffstat (limited to 'libswresample')
0 files changed, 0 insertions, 0 deletions