aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-09-17 22:25:13 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-09-17 22:36:43 +0200
commit9a9ceb8776264c799ff9669ed7e287a5daaab564 (patch)
tree25748ff74acaa620aa627ed7797a87e986959f19 /doc
parent979bea13003ef489d95d2538ac2fb1c26c6f103b (diff)
parentd763fb7d47fdbd107ea65cdf511f2f21558f6610 (diff)
downloadffmpeg-9a9ceb8776264c799ff9669ed7e287a5daaab564.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: lavfi: add select filter oggdec: fix out of bound write in the ogg demuxer movenc: create an alternate group for each media type lavd: add libcdio-paranoia input device for audio CD grabbing rawdec: refactor private option for raw video demuxers pcmdec: use unique classes for all pcm demuxers. rawdec: g722 is always 1 channel/16kHz Conflicts: Changelog configure doc/filters.texi libavdevice/avdevice.h libavfilter/avfilter.h libavfilter/vf_select.c tests/ref/lavf/mov Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
-rw-r--r--doc/filters.texi26
1 files changed, 13 insertions, 13 deletions
diff --git a/doc/filters.texi b/doc/filters.texi
index d411d52a14..a8600a57c1 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -1680,26 +1680,26 @@ the PTS of the first video frame in the video, NAN if undefined
the time of the first video frame in the video, NAN if undefined
@item pict_type
-the picture type of the filtered frame, can assume one of the following
+the type of the filtered frame, can assume one of the following
values:
@table @option
-@item PICT_TYPE_I
-@item PICT_TYPE_P
-@item PICT_TYPE_B
-@item PICT_TYPE_S
-@item PICT_TYPE_SI
-@item PICT_TYPE_SP
-@item PICT_TYPE_BI
+@item I
+@item P
+@item B
+@item S
+@item SI
+@item SP
+@item BI
@end table
@item interlace_type
the frame interlace type, can assume one of the following values:
@table @option
-@item INTERLACE_TYPE_P
+@item PROGRESSIVE
the frame is progressive (not interlaced)
-@item INTERLACE_TYPE_T
+@item TOPFIRST
the frame is top-field-first
-@item INTERLACE_TYPE_B
+@item BOTTOMFIRST
the frame is bottom-field-first
@end table
@@ -1726,7 +1726,7 @@ select=1
select=0
# select only I-frames
-select='eq(pict_type\,PICT_TYPE_I)'
+select='eq(pict_type\,I)'
# select one frame every 100
select='not(mod(n\,100))'
@@ -1735,7 +1735,7 @@ select='not(mod(n\,100))'
select='gte(t\,10)*lte(t\,20)'
# select only I frames contained in the 10-20 time interval
-select='gte(t\,10)*lte(t\,20)*eq(pict_type\,PICT_TYPE_I)'
+select='gte(t\,10)*lte(t\,20)*eq(pict_type\,I)'
# select frames with a minimum distance of 10 seconds
select='isnan(prev_selected_t)+gte(t-prev_selected_t\,10)'