update ffms2 to r409
Originally committed to SVN as r5158.
This commit is contained in:
parent
a08eb28846
commit
a90d855950
1 changed files with 4 additions and 2 deletions
|
@ -30,6 +30,10 @@
|
||||||
# include <fcntl.h>
|
# include <fcntl.h>
|
||||||
extern "C" {
|
extern "C" {
|
||||||
# include "libavutil/avstring.h"
|
# include "libavutil/avstring.h"
|
||||||
|
/* if you have this, we'll assume you have a new enough libavutil too */
|
||||||
|
# if LIBSWSCALE_VERSION_INT >= AV_VERSION_INT(0, 12, 0)
|
||||||
|
# include <libavutil/opt.h>
|
||||||
|
# endif
|
||||||
}
|
}
|
||||||
#endif // _WIN32
|
#endif // _WIN32
|
||||||
|
|
||||||
|
@ -45,8 +49,6 @@ extern const AVCodecTag ff_codec_bmp_tags[];
|
||||||
extern const CodecTags ff_mkv_codec_tags[];
|
extern const CodecTags ff_mkv_codec_tags[];
|
||||||
extern const AVCodecTag ff_codec_movvideo_tags[];
|
extern const AVCodecTag ff_codec_movvideo_tags[];
|
||||||
extern const AVCodecTag ff_codec_wav_tags[];
|
extern const AVCodecTag ff_codec_wav_tags[];
|
||||||
|
|
||||||
#include <libavutil/opt.h>
|
|
||||||
}
|
}
|
||||||
|
|
||||||
extern int CPUFeatures;
|
extern int CPUFeatures;
|
||||||
|
|
Loading…
Reference in a new issue