ffmpeg | branch: master | Derek Buitenhuis <derek.buitenh...@gmail.com> | Sun
Nov 22 17:10:42 2015 +0000| [5ebaf1e1cbee6097264b594dc66177cc1b6daaf2] |
committer: Derek Buitenhuis
Merge commit '79d89cf2f4b62eeb653fd8139041c87e75f7ca65'
* commit '79d89cf2f4b62eeb653fd8139041c87e75f7ca65':
flacenc: Clamp user-supplied min/max prediction orders
Conflicts:
libavcodec/flacenc.c
Merged-by: Derek Buitenhuis <derek.buitenh...@gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5ebaf1e1cbee6097264b594dc66177cc1b6daaf2
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
