← Back to branch summary

~ubuntu-branches/debian/sid/ffmpeg/sid

« back to all changes in this revision

Viewing changes to ffmpeg_opt.c

  • Committer: Package Import Robot
  • Author(s): Andreas Cadhalpun
  • Date: 2015-05-17 22:03:38 UTC
  • mfrom: (0.1.25)
  • Revision ID: package-import@ubuntu.com-20150517220338-c62d5dxib1p3w65y
Tags: 7:2.6.3-1
* Import new upstream bugfix release 2.6.3.
* Don't install the pc-uninstalled directory.
  It is only useful in the source.
* Use 'set -e' in the autopkgtests.
* Explicitly build-depend on pkg-config.
* Enable gnutls and librtmp on sparc64, libvpx and libsdl on x32 and
  opencv on powerpcspe, since they are now available.
* Disable i686 optimizations on (hurd-)i386, because i586 is still
  supported.
* Temporarily use gdb in sparc64 builds to investigate test failures.
* Re-enable assembler optimizations on ppc64el, since they are
  finally really fixed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ffmpeg_opt.c
2859
2859
    { "itsscale",       HAS_ARG | OPT_DOUBLE | OPT_SPEC |
2860
2860
                        OPT_EXPERT | OPT_INPUT,                      { .off = OFFSET(ts_scale) },
2861
2861
        "set the input ts scale", "scale" },
2862
 
    { "timestamp",      HAS_ARG | OPT_PERFILE,                       { .func_arg = opt_recording_timestamp },
 
2862
    { "timestamp",      HAS_ARG | OPT_PERFILE | OPT_OUTPUT,          { .func_arg = opt_recording_timestamp },
2863
2863
        "set the recording timestamp ('now' to set the current time)", "time" },
2864
2864
    { "metadata",       HAS_ARG | OPT_STRING | OPT_SPEC | OPT_OUTPUT, { .off = OFFSET(metadata) },
2865
2865
        "add metadata", "string=string" },