falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

Merge commit '4a8562394b685e83ae4a38a93eef43625755a231' 

* commit '4a8562394b685e83ae4a38a93eef43625755a231':
  configure: Use the right pkgconf file for openjpeg

Conflicts:
	configure

No change as the incorrect code wasnt in ffmpegs configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.3
Michael Niedermayer 11 years ago
parent
b73cf4eb15 4a8562394b
commit
182c674f68
Unified View
Diff Options
Show Stats Download Patch File Download Diff File

Diff Content Not Available