Merge commit 'f825d42bccdb9f89669a586951de7f66a81e80a5'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Oct 2013 17:01:36 +0000 (19:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Oct 2013 17:07:28 +0000 (19:07 +0200)
commitcf47a6a1a0848567d1453f2830d567f22e551dca
treeb67e45211796ec4045fbbba753cb533a45ebc22a
parentc2f3715cb3fce093137591e3005de3e831b1f9fd
parentf825d42bccdb9f89669a586951de7f66a81e80a5
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: 1060e9ce5454e7ac009969ab2cf8f7cd83a69ac3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
cmdutils.c
cmdutils.h
cmdutils_common_opts.h