diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-19 01:32:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-19 02:08:59 +0200 |
| commit | 70d9fb696393277247101da47e67d568a6aea4d9 (patch) | |
| tree | adba052f93445216b060f2afd0dbefd76644d84a /doc | |
| parent | 35674a29b7f6cff70e3998b5d90feb693c817196 (diff) | |
| parent | d97ca425efeb468bc8e9db891385a909883177bb (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
sunrast: Check for out of bounds reads
lavc: rename AV_ER_* options to AV_EF_* and rename AGGRESSIVE to BUFFER
lavc: replace API-bump-triggered AVCodecContext field change with shorter, non-conflicting name
Add libvpx presets.
doc/avtools: add forgotten part to stream specifiers description
swscale: prevent overflow during initialization
g722: Add a fate test for the encoder
fate: Add a target for creating a 16000 Hz mono synthetic audio file
macosx: use the default surface on newer sdl
Conflicts:
ffplay.c
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/avtools-common-opts.texi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/avtools-common-opts.texi b/doc/avtools-common-opts.texi index 151c269955..33b3b481b6 100644 --- a/doc/avtools-common-opts.texi +++ b/doc/avtools-common-opts.texi @@ -37,7 +37,7 @@ thread count for the second stream to 4. 'd' for data and 't' for attachments. If @var{stream_index} is given, then matches stream number @var{stream_index} of this type. Otherwise matches all streams of this type. -@item @var{program_id}[:@var{stream_index}] +@item p:@var{program_id}[:@var{stream_index}] If @var{stream_index} is given, then matches stream number @var{stream_index} in program with id @var{program_id}. Otherwise matches all streams in this program. @end table |