diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-01 12:30:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-01 12:30:30 +0200 |
| commit | cca229e75a55a5755abf7dc4547d9dce42e2edc8 (patch) | |
| tree | 945e9afd45170ef643b2a948e42743f52bf3be65 /libswscale/x86/output.asm | |
| parent | fcccb4c11dcfcbdbb4b0d6eed5ed276d946c7d13 (diff) | |
| parent | c7e921a54ffe7feb9f695c82f0a0764ab8d0f62b (diff) | |
| download | ffmpeg-cca229e75a55a5755abf7dc4547d9dce42e2edc8.tar.gz | |
Merge commit 'c7e921a54ffe7feb9f695c82f0a0764ab8d0f62b'
* commit 'c7e921a54ffe7feb9f695c82f0a0764ab8d0f62b':
avopt: Check whether the object actually has got an AVClass
Conflicts:
libavutil/opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/x86/output.asm')
0 files changed, 0 insertions, 0 deletions