diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-20 14:29:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-20 14:29:23 +0200 |
| commit | 4b6e46c4277ec46041840ed4873d5658a2fd897e (patch) | |
| tree | 70e5806c38f3f78be2cd7020add41b6ad2428048 /libswscale/bfin/internal_bfin.S | |
| parent | 516ba41f05c8a0e4054d2a858e2951a6091c4811 (diff) | |
| parent | f7395926f204051af9ad459a6d876b96ee6179ee (diff) | |
| download | ffmpeg-4b6e46c4277ec46041840ed4873d5658a2fd897e.tar.gz | |
Merge commit 'f7395926f204051af9ad459a6d876b96ee6179ee' into release/2.2
* commit 'f7395926f204051af9ad459a6d876b96ee6179ee':
avconv: fix parsing the AVOptions for -target
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/bfin/internal_bfin.S')
0 files changed, 0 insertions, 0 deletions