[FFmpeg-cvslog] Merge commit 'c1fcfdec75468009dc7de29a5d1c6adf3b2ef77d'

Michael Niedermayer git at videolan.org
Tue Oct 16 14:01:09 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Oct 16 13:57:10 2012 +0200| [5717562c789f9be9c8e4bab7caec4df83f77cebe] | committer: Michael Niedermayer

Merge commit 'c1fcfdec75468009dc7de29a5d1c6adf3b2ef77d'

* commit 'c1fcfdec75468009dc7de29a5d1c6adf3b2ef77d':
  rangecoder-test: Return in case of an error
  build: simplify enabling of compat objects

Conflicts:
	configure
	libavutil/Makefile

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

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





More information about the ffmpeg-cvslog mailing list