Merge commit 'f825d42b'
* commit 'f825d42b': avplay: Accept cpuflags option Conflicts: cmdutils_common_opts.h doc/ffmpeg.texi doc/fftools-common-opts.texi ffmpeg_opt.c See: 1060e9ceMerged-by: Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment