diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-15 15:23:20 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-15 15:23:20 +0100 |
commit | cfc40a6aff8d35627469ef960531264c2f66a74e (patch) | |
tree | 8b153d939fe63d808438c444b464be66c81c4ae2 /configure | |
parent | 24d06cb2089fbe74912e82d613b8c166be1386a8 (diff) | |
parent | d8c772de53d29afb1bada88afa859fce8489c668 (diff) | |
download | ffmpeg-streaming-cfc40a6aff8d35627469ef960531264c2f66a74e.zip ffmpeg-streaming-cfc40a6aff8d35627469ef960531264c2f66a74e.tar.gz |
Merge commit 'd8c772de53d29afb1bada88afa859fce8489c668'
* commit 'd8c772de53d29afb1bada88afa859fce8489c668':
nutdec: Always return a value from nut_read_timestamp()
configure: Make warnings from -Wreturn-type fatal errors
x86: ABS2: port to cpuflags
vdpau: Remove av_unused attribute from function declaration
h264: fix ff_generate_sliding_window_mmcos() prototype.
Conflicts:
configure
libavformat/nutdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -4101,6 +4101,7 @@ elif enabled gcc; then check_optflags -fno-tree-vectorize check_cflags -Werror=implicit-function-declaration check_cflags -Werror=missing-prototypes + check_cflags -Werror=return-type check_cflags -Werror=vla elif enabled llvm_gcc; then check_cflags -mllvm -stack-alignment=16 @@ -4109,6 +4110,7 @@ elif enabled clang; then check_cflags -Qunused-arguments check_cflags -Werror=implicit-function-declaration check_cflags -Werror=missing-prototypes + check_cflags -Werror=return-type elif enabled armcc; then # 2523: use of inline assembler is deprecated add_cflags -W${armcc_opt},--diag_suppress=2523 |