[FFmpeg-cvslog] Merge commit '23d461fe8714a20ee5e6929f22c61512fdda568e'

Michael Niedermayer git at videolan.org
Thu Jan 30 15:07:38 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 30 14:55:03 2014 +0100| [3c7195a96933e27c395a617a178f43ef4bc65a92] | committer: Michael Niedermayer

Merge commit '23d461fe8714a20ee5e6929f22c61512fdda568e'

* commit '23d461fe8714a20ee5e6929f22c61512fdda568e':
  ac3dec: Allow asymmetric application of DRC when drc_scale > 1

Conflicts:
	libavcodec/ac3dec.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3c7195a96933e27c395a617a178f43ef4bc65a92
---





More information about the ffmpeg-cvslog mailing list