Commit 9f95e355 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: add -af option
  ffplay: use refcounted frames for audio
  ffplay: use frame->pts if available for setting the audio clock
  ffplay: restructure audio stream opening code
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 0f955346 e96175ad
...@@ -8,6 +8,7 @@ version <next>: ...@@ -8,6 +8,7 @@ version <next>:
or vice versa or vice versa
- support for Monkey's Audio versions from 3.93 - support for Monkey's Audio versions from 3.93
- perms and aperms filters - perms and aperms filters
- audio filtering support in ffplay
version 1.2: version 1.2:
......
...@@ -84,6 +84,12 @@ output. In the filter graph, the input is associated to the label ...@@ -84,6 +84,12 @@ output. In the filter graph, the input is associated to the label
ffmpeg-filters manual for more information about the filtergraph ffmpeg-filters manual for more information about the filtergraph
syntax. syntax.
@item -af @var{filter_graph}
@var{filter_graph} is a description of the filter graph to apply to
the input audio.
Use the option "-filters" to show all the available filters (including
sources and sinks).
@item -i @var{input_file} @item -i @var{input_file}
Read @var{input_file}. Read @var{input_file}.
@end table @end table
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment