[FFmpeg-cvslog] Merge commit '58d7b835e3cec48ab5a2393405fe82dee72c06a0' into release/1.1

Michael Niedermayer git at videolan.org
Fri Aug 8 14:18:36 CEST 2014


ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Fri Aug  8 14:14:06 2014 +0200| [6e83c266201adb15971bc3ad5c6c41fedace08ac] | committer: Michael Niedermayer

Merge commit '58d7b835e3cec48ab5a2393405fe82dee72c06a0' into release/1.1

* commit '58d7b835e3cec48ab5a2393405fe82dee72c06a0':
  fate: Add dependencies for dct/fft/mdct/rdft tests

Conflicts:
	libavcodec/fft-test.c

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

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





More information about the ffmpeg-cvslog mailing list