diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-17 05:24:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-17 05:24:41 +0100 |
| commit | 9f95e355be16150a2bc00145d5a72e2a5e017b29 (patch) | |
| tree | 708996190fa0557091fbb6b6d4a848316175b47d /libavfilter/vf_alphamerge.c | |
| parent | 0f95534669a114539e410b05fde6dea3c5cfe19a (diff) | |
| parent | e96175ad7b576ad57b83d399193ef10b2bb016ae (diff) | |
| download | ffmpeg-9f95e355be16150a2bc00145d5a72e2a5e017b29.tar.gz | |
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: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_alphamerge.c')
0 files changed, 0 insertions, 0 deletions