Michael Niedermayer cf47a6a1a0 Merge commit 'f825d42bccdb9f89669a586951de7f66a81e80a5' ...

* commit 'f825d42bccdb9f89669a586951de7f66a81e80a5':
  avplay: Accept cpuflags option

Conflicts:
	cmdutils_common_opts.h
	doc/ffmpeg.texi
	doc/fftools-common-opts.texi
	ffmpeg_opt.c

See: 1060e9ce54
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-10-22 19:07:28 +02:00

62 KiB

Raw Blame History

View Raw