diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-27 12:52:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-27 12:55:31 +0200 |
| commit | 2082c00ea2ed13a2a85d45a024bdc0beb3f18aff (patch) | |
| tree | 9aadc05e255f5c494eb486a93b2f535ea883d9cb /libswresample/swresampleres.rc | |
| parent | ad207f1119d961bb83177765226ee8f3b80e369f (diff) | |
| parent | f5245a9c6206878b892adf3ccbccc9311c202af5 (diff) | |
| download | ffmpeg-2082c00ea2ed13a2a85d45a024bdc0beb3f18aff.tar.gz | |
Merge commit 'f5245a9c6206878b892adf3ccbccc9311c202af5'
* commit 'f5245a9c6206878b892adf3ccbccc9311c202af5':
avconv: fix parsing the AVOptions for -target
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/swresampleres.rc')
0 files changed, 0 insertions, 0 deletions