diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2015-11-22 17:10:42 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2015-11-22 17:10:42 +0000 |
| commit | 5ebaf1e1cbee6097264b594dc66177cc1b6daaf2 (patch) | |
| tree | 9e60cd2c32ebab2868ecabfeccc702676eff636b /libavcodec/mpeg_er.c | |
| parent | bba2488f074904069e38865654413ec44d35ec24 (diff) | |
| parent | 79d89cf2f4b62eeb653fd8139041c87e75f7ca65 (diff) | |
| download | ffmpeg-5ebaf1e1cbee6097264b594dc66177cc1b6daaf2.tar.gz | |
Merge commit '79d89cf2f4b62eeb653fd8139041c87e75f7ca65'
* commit '79d89cf2f4b62eeb653fd8139041c87e75f7ca65':
flacenc: Clamp user-supplied min/max prediction orders
Conflicts:
libavcodec/flacenc.c
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/mpeg_er.c')
0 files changed, 0 insertions, 0 deletions