diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-26 13:54:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-26 13:54:29 +0200 |
| commit | 444ce03f0f15024f596e42753343455291f2b558 (patch) | |
| tree | 53fbffe8a22019e2ecd4b36ec23ad07ffd77a096 /libavfilter | |
| parent | fcd08b77705997f39f88eab268639c2b76cbc6b1 (diff) | |
| parent | 44758b4d17f6bcdfca74d329ad2fcff3e930bdbd (diff) | |
| download | ffmpeg-444ce03f0f15024f596e42753343455291f2b558.tar.gz | |
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: add support for libswresample options
ffplay: use av_frame_get_pkt_pos instead directly accessing pkt pos
ffplay: factor out picture freeing code
ffplay: update and extend documentation for channel and stream switching
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
0 files changed, 0 insertions, 0 deletions