← Back to branch summary

~siretart/libav/trusty-security

« back to all changes in this revision

Viewing changes to doc/filters.texi

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2013-03-27 07:57:15 UTC
  • mfrom: (1.3.32 sid)
  • Revision ID: package-import@ubuntu.com-20130327075715-0sg19vuqtup2xfjj
Tags: 6:0.8.6-1ubuntu1
https://launchpad.net/bugs/1160734
https://launchpad.net/bugs/1143929
https://launchpad.net/bugs/1101829
* Merge from debian/unstable, LP: #1160734, remaining changes:
  - don't build against libdirac, lame, libopenjpeg, librtmp, frei0r,
    vo-aacenc, vo-amrenc, x264, and xvid  (all in universe)
  - do not build libav-extra-dbg, it is build from the libav-extra source
    package in ubuntu.
  - drop libav-regular-dbg, not necessary in ubuntu
  - Adjust LIB_PKGS/LIB_PKGS2 lists in debian/rules
  - several ifdefs in debian/rules that allow the use of the same file
    in libav and libav-extra (most of this can be merged into the debian
    package)
* Tested that co-instability of libavcodec-dev with libavcodec-extra-53 works.
  LP: #1143929, #1101829
* Remove all debug packages. In ubuntu, we provide debug symbols via the
  .ddeb infrastructure.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/filters.texi
82
82
@var{LINKLABEL}        ::= "[" @var{NAME} "]"
83
83
@var{LINKLABELS}       ::= @var{LINKLABEL} [@var{LINKLABELS}]
84
84
@var{FILTER_ARGUMENTS} ::= sequence of chars (eventually quoted)
85
 
@var{FILTER}           ::= [@var{LINKNAMES}] @var{NAME} ["=" @var{ARGUMENTS}] [@var{LINKNAMES}]
 
85
@var{FILTER}           ::= [@var{LINKLABELS}] @var{NAME} ["=" @var{FILTER_ARGUMENTS}] [@var{LINKLABELS}]
86
86
@var{FILTERCHAIN}      ::= @var{FILTER} [,@var{FILTERCHAIN}]
87
87
@var{FILTERGRAPH}      ::= @var{FILTERCHAIN} [;@var{FILTERGRAPH}]
88
88
@end example