[FFmpeg-cvslog] Merge commit '871d99ef77336069e5a8ece947c8160d9bc4d5ea' into release/2.2

Michael Niedermayer git at videolan.org
Tue Dec 2 13:46:13 CET 2014


ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Tue Dec  2 13:14:06 2014 +0100| [9181faab68a6a6ee22c7490085e13ffac90d7119] | committer: Michael Niedermayer

Merge commit '871d99ef77336069e5a8ece947c8160d9bc4d5ea' into release/2.2

* commit '871d99ef77336069e5a8ece947c8160d9bc4d5ea':
  mp3enc: fix a triggerable assert

Conflicts:
	libavformat/mp3enc.c

No change, the faulty assert was not in FFmpeg

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

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





More information about the ffmpeg-cvslog mailing list