diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-07 21:55:30 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-07 21:55:34 +0200 |
commit | 9f7b014ad32fd87efcada0297d83546decb48fe7 (patch) | |
tree | e2271906e4bdab182e8cfd827bcc4b139c2fdf29 /libavdevice/lavfi.c | |
parent | 67732b9d62576c67589773e5332e94aac429cc4c (diff) | |
parent | 5fdcfdf2370d4c1552601a0633beea0bc84aa437 (diff) | |
download | ffmpeg-9f7b014ad32fd87efcada0297d83546decb48fe7.tar.gz |
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: fix build if avfilter is disabled
ffplay: fix frame_delay calculation in new avfilter code
ffplay: add support for changing pixel format
ffplay: add missing filt_in assignment after video filter reconfigure
ffplay: fix frame aspect ratio after qatar merge
ffplay: fix use after free
ffplay: use dummy video driver if display is disabled
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/lavfi.c')
0 files changed, 0 insertions, 0 deletions