diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 17:30:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 17:41:31 +0100 |
| commit | 6db37c9468051ff34cac58fa428bc5d86fc1ee45 (patch) | |
| tree | ac578a2ae106cb9a15f37769a87f5d4cf1dd3405 /COPYING.GPLv2 | |
| parent | 71cf094e1be086bce4c535b1fe0d96a0449486ae (diff) | |
| parent | 5c7db097ebe1fb5c233cedd8846615074e7d6044 (diff) | |
| download | ffmpeg-6db37c9468051ff34cac58fa428bc5d86fc1ee45.tar.gz | |
Merge commit '5c7db097ebe1fb5c233cedd8846615074e7d6044'
* commit '5c7db097ebe1fb5c233cedd8846615074e7d6044':
avconv: pass libavresample options to AVFilterGraph
Conflicts:
cmdutils.c
cmdutils.h
ffmpeg_filter.c
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'COPYING.GPLv2')
0 files changed, 0 insertions, 0 deletions