[FFmpeg-cvslog] Merge commit 'd3ea79e8a65ddad4da11813bb43c46701295f68c'

Michael Niedermayer git at videolan.org
Sun Jun 28 11:48:24 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jun 28 11:41:23 2015 +0200| [fb2eeebf662ef3f3b0600da8471b3ff120afb652] | committer: Michael Niedermayer

Merge commit 'd3ea79e8a65ddad4da11813bb43c46701295f68c'

* commit 'd3ea79e8a65ddad4da11813bb43c46701295f68c':
  FATE: drop the last truncated frame from the wma lossless test

Conflicts:
	tests/fate/lossless-audio.mak

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

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





More information about the ffmpeg-cvslog mailing list