[FFmpeg-cvslog] Merge commit '86f4c59bd676672040b89d8fea4c9e3b59bfe7ab'

Michael Niedermayer git at videolan.org
Tue Aug 6 16:41:32 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug  6 16:36:25 2013 +0200| [7d03e60c124be3e316636b0086910f1bcc1a797d] | committer: Michael Niedermayer

Merge commit '86f4c59bd676672040b89d8fea4c9e3b59bfe7ab'

* commit '86f4c59bd676672040b89d8fea4c9e3b59bfe7ab':
  twinvq: Split VQF-specific part from common TwinVQ decoder core

Conflicts:
	libavcodec/Makefile
	libavcodec/twinvq.c

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

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





More information about the ffmpeg-cvslog mailing list