OSDN Git Service
(root)
/
coroid
/
ffmpeg_saccubus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'qatar/master'
[coroid/ffmpeg_saccubus.git]
/
libavcodec
/
version.h
diff --git
a/libavcodec/version.h
b/libavcodec/version.h
index
dfa1445
..
a9c389c
100644
(file)
--- a/
libavcodec/version.h
+++ b/
libavcodec/version.h
@@
-83,5
+83,8
@@
#ifndef FF_API_AVCODEC_INIT
#define FF_API_AVCODEC_INIT (LIBAVCODEC_VERSION_MAJOR < 54)
#endif
+#ifndef FF_API_X264_GLOBAL_OPTS
+#define FF_API_X264_GLOBAL_OPTS (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
#endif /* AVCODEC_VERSION_H */