diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-16 05:58:37 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-16 05:58:57 +0400 |
| commit | eac281b06c453c0af0ffc2a8fb72f976abe583cb (patch) | |
| tree | df7c58ed9711ab510af90b10a4974bae60893c44 /libavformat | |
| parent | 6ba07e9948d5c9bcb7a0f270f150fbb2f99074e1 (diff) | |
| parent | b920c1d5ad5cfe74c95b0eaec0e69b074ee9b4c1 (diff) | |
Merge commit 'b920c1d' into release/2.2
* commit 'b920c1d':
configure: Support older version of openjpeg1
Conflicts:
configure
Not merged as the problematic pkg config code wasnt merged
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
0 files changed, 0 insertions, 0 deletions