chris/Cog
2
1
Fork 0
Code Issues 65 Pull requests Projects Releases Packages Wiki Activity Actions

Updated FFmpeg to version 3.1.3.

Browse source
This commit is contained in:
Christopher Snowhill 2016-09-01 17:20:19 -07:00
parent d298087dec
commit 434d95fccc
7 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ThirdParty/ffmpeg/include/libavutil/ffversion.h vendored
View file

@ -1,5 +1,5 @@
/* Automatically generated by version.sh, do not manually edit! */ /* Automatically generated by version.sh, do not manually edit! */
#ifndef AVUTIL_FFVERSION_H #ifndef AVUTIL_FFVERSION_H
#define AVUTIL_FFVERSION_H #define AVUTIL_FFVERSION_H
#define FFMPEG_VERSION "n3.1.1-2-g64aba84" #define FFMPEG_VERSION "n3.1.3-2-g9ee01cd"
#endif /* AVUTIL_FFVERSION_H */ #endif /* AVUTIL_FFVERSION_H */

4
ThirdParty/ffmpeg/include/libavutil/opt.h vendored
View file

@ -58,7 +58,7 @@
* The following example illustrates an AVOptions-enabled struct: * The following example illustrates an AVOptions-enabled struct:
* @code * @code
* typedef struct test_struct { * typedef struct test_struct {
* AVClass *class; * const AVClass *class;
* int int_opt; * int int_opt;
* char *str_opt; * char *str_opt;
* uint8_t *bin_opt; * uint8_t *bin_opt;
@ -96,7 +96,7 @@
* @code * @code
* test_struct *alloc_test_struct(void) * test_struct *alloc_test_struct(void)
* { * {
* test_struct *ret = av_malloc(sizeof(*ret)); * test_struct *ret = av_mallocz(sizeof(*ret));
* ret->class = &test_class; * ret->class = &test_class;
* av_opt_set_defaults(ret); * av_opt_set_defaults(ret);
* return ret; * return ret;

BIN
ThirdParty/ffmpeg/lib/libavcodec.a vendored
View file

Binary file not shown.

BIN
ThirdParty/ffmpeg/lib/libavformat.a vendored
View file

Binary file not shown.

BIN
ThirdParty/ffmpeg/lib/libavutil.a vendored
View file

Binary file not shown.

2
ThirdParty/ffmpeg/lib/pkgconfig/libavcodec.pc vendored
View file

@ -9,6 +9,6 @@ Version: 57.48.101
Requires: libavutil >= 55.28.100 Requires: libavutil >= 55.28.100
Requires.private: Requires.private:
Conflicts: Conflicts:
Libs: -L${libdir} -lavcodec -framework QuartzCore -framework CoreFoundation -framework VideoToolbox -framework CoreMedia -framework CoreVideo -framework CoreFoundation -framework AudioToolbox -framework CoreMedia -framework VideoDecodeAcceleration -framework CoreFoundation -framework QuartzCore -liconv -Wl,-framework,CoreFoundation -Wl,-framework,Security -L/usr/local/lib -lSDLmain -lSDL -Wl,-framework,Cocoa -lm -lbz2 -lz -pthread -framework CoreServices Libs: -L${libdir} -lavcodec -framework QuartzCore -framework CoreFoundation -framework VideoToolbox -framework CoreMedia -framework CoreVideo -framework CoreFoundation -framework AudioToolbox -framework CoreMedia -framework VideoDecodeAcceleration -framework CoreFoundation -framework QuartzCore -liconv -L/opt/local/lib -lxcb -L/opt/local/lib -lxcb-shm -L/opt/local/lib -lxcb-xfixes -L/opt/local/lib -lxcb-shape -Wl,-framework,CoreFoundation -Wl,-framework,Security -L/opt/local/lib -lSDLmain -Wl,-framework,AppKit -lSDL -Wl,-framework,Cocoa -lm -lbz2 -lz -pthread -framework CoreServices
Libs.private: Libs.private:
Cflags: -I${includedir} Cflags: -I${includedir}

2
ThirdParty/ffmpeg/lib/pkgconfig/libavformat.pc vendored
View file

@ -9,6 +9,6 @@ Version: 57.41.100
Requires: libavcodec >= 57.48.101, libavutil >= 55.28.100 Requires: libavcodec >= 57.48.101, libavutil >= 55.28.100
Requires.private: Requires.private:
Conflicts: Conflicts:
Libs: -L${libdir} -lavformat -framework QuartzCore -framework CoreFoundation -framework VideoToolbox -framework CoreMedia -framework CoreVideo -framework CoreFoundation -framework AudioToolbox -framework CoreMedia -framework VideoDecodeAcceleration -framework CoreFoundation -framework QuartzCore -liconv -Wl,-framework,CoreFoundation -Wl,-framework,Security -L/usr/local/lib -lSDLmain -lSDL -Wl,-framework,Cocoa -lm -lbz2 -lz -pthread -framework CoreServices Libs: -L${libdir} -lavformat -framework QuartzCore -framework CoreFoundation -framework VideoToolbox -framework CoreMedia -framework CoreVideo -framework CoreFoundation -framework AudioToolbox -framework CoreMedia -framework VideoDecodeAcceleration -framework CoreFoundation -framework QuartzCore -liconv -L/opt/local/lib -lxcb -L/opt/local/lib -lxcb-shm -L/opt/local/lib -lxcb-xfixes -L/opt/local/lib -lxcb-shape -Wl,-framework,CoreFoundation -Wl,-framework,Security -L/opt/local/lib -lSDLmain -Wl,-framework,AppKit -lSDL -Wl,-framework,Cocoa -lm -lbz2 -lz -pthread -framework CoreServices
Libs.private: Libs.private:
Cflags: -I${includedir} Cflags: -I${includedir}