a07ac1f788
Fix type of shared flac table ff_flac_blocksize_table[].
...
Fixes ticket #2533 .
2013-05-05 19:29:00 +02:00
2d8dddd926
Merge branch 'vdpau' of https://github.com/FernetMenta/FFmpeg
...
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 16:28:18 +02:00
fb90e7b86d
configure: Use the tool specified with --valgrind instead of a hardcoded "valgrind"
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 16:22:44 +02:00
54021aea57
configure: set valgrind-memcheck toolchain when --valgrind is specified
...
This avoids duplicating the default command line arguments
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 16:21:57 +02:00
fe1f36547d
register AV_PIX_FMT_VDPAU for hwaccel
2013-05-05 16:15:41 +02:00
b37cc5995b
fix vdpau vc1 interlace modes
2013-05-05 15:12:59 +02:00
cdfa1c89b7
avcodec: Set frame.width/height on all exit pathes of ff_get_buffer()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 14:23:16 +02:00
548101b553
lavu/opencl: add opencl public error API
...
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 13:44:29 +02:00
097f668047
avformat: replace "AVPROBE_SCORE_MAX / X" by AVPROBE_SCORE_EXTENSION / Y
...
Demuxers where the changed code looked less readable where skiped
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 13:34:56 +02:00
a1f234be11
make the ordering of the return type and av_cold consistent
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 13:13:00 +02:00
35623d833e
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
configure: Check for getenv
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 13:05:45 +02:00
d5dbd84c9a
Merge commit '2b677ffca54a5fbef9c8860841c32f28ecd68f70'
...
* commit '2b677ffca54a5fbef9c8860841c32f28ecd68f70':
swscale: Add av_cold attributes to init functions missing them
Conflicts:
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 13:00:21 +02:00
3c200aa693
Merge commit '1fda184a85178cfd7b98d9e308d18e1ded76a511'
...
* commit '1fda184a85178cfd7b98d9e308d18e1ded76a511':
avutil: Add av_cold attributes to init functions missing them
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 12:53:50 +02:00
e7f8493fd8
Merge commit '20c86571ccc71412781d4a4813e4693e0c42aec6'
...
* commit '20c86571ccc71412781d4a4813e4693e0c42aec6':
lavfi: let gcc realign the stack on public graph driving functions
Conflicts:
libavfilter/buffersink.c
libavfilter/buffersrc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 12:48:25 +02:00
fdccb84e3b
Merge commit 'c0c2b96c136ec2cbfd808eefc26de399f447d62f'
...
* commit 'c0c2b96c136ec2cbfd808eefc26de399f447d62f':
sctp: Add a note on why sctp_recvmsg and sctp_sendmsg have ff_-prefixes
avs: Increase magic value score above file extension score
Conflicts:
libavformat/avs.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 12:41:36 +02:00
f083b4c338
Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'
...
* commit 'e0f8be6413b6a8d334d6052e610af32935c310af':
avformat: Add AVPROBE_SCORE_EXTENSION define and use where appropriate
Conflicts:
libavformat/ac3dec.c
libavformat/avformat.h
libavformat/avs.c
libavformat/m4vdec.c
libavformat/mov.c
libavformat/mp3dec.c
libavformat/mpeg.c
libavformat/mpegvideodec.c
libavformat/psxstr.c
libavformat/pva.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 12:31:03 +02:00
77570facdb
Merge commit '4d7ed3e73541983459a7913c2034eba69ebc113d'
...
* commit '4d7ed3e73541983459a7913c2034eba69ebc113d':
build: output-example: Add avutil to ELIBS in link command
Conflicts:
libavformat/Makefile
No change as our example build code doesnt have this bug
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 12:00:24 +02:00
b507c00dc0
Merge commit 'e445647b4fdf481b13b2743b303d84de4f43bedd'
...
* commit 'e445647b4fdf481b13b2743b303d84de4f43bedd':
avresample: Add av_cold attributes to init functions missing them
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 11:50:37 +02:00
a8ff830b79
Merge commit '093804a93cc5da3f95f98265a5df116912443cec'
...
* commit '093804a93cc5da3f95f98265a5df116912443cec':
avfilter: Add av_cold attributes to init/uninit functions
Conflicts:
libavfilter/af_ashowinfo.c
libavfilter/af_volume.c
libavfilter/src_movie.c
libavfilter/vf_lut.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 11:42:18 +02:00
0aa095483d
Merge commit '6fee1b90ce3bf4fbdfde7016e0890057c9000487'
...
* commit '6fee1b90ce3bf4fbdfde7016e0890057c9000487':
avcodec: Add av_cold attributes to init functions missing them
Conflicts:
libavcodec/aacpsy.c
libavcodec/atrac3.c
libavcodec/dvdsubdec.c
libavcodec/ffv1.c
libavcodec/ffv1enc.c
libavcodec/h261enc.c
libavcodec/h264_parser.c
libavcodec/h264dsp.c
libavcodec/h264pred.c
libavcodec/libschroedingerenc.c
libavcodec/libxvid_rc.c
libavcodec/mpeg12.c
libavcodec/mpeg12enc.c
libavcodec/proresdsp.c
libavcodec/rangecoder.c
libavcodec/videodsp.c
libavcodec/x86/proresdsp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 11:34:29 +02:00
057c5d2e16
Merge commit '72e228b274a98af1aba9588415d0cd87fde44663'
...
* commit '72e228b274a98af1aba9588415d0cd87fde44663':
nut: K&R formatting cosmetics
Conflicts:
libavformat/nut.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 11:19:12 +02:00
86c9cf643b
configure: fix valgrind-memcheck arguments
...
They now match the --valgrind arguments
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 10:52:39 +02:00
4451be5ce1
Merge commit 'b1ee8eec849f17fce2f411a297de9cbf2edaeb3a'
...
* commit 'b1ee8eec849f17fce2f411a297de9cbf2edaeb3a':
configure: Add basic valgrind-memcheck support
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 10:47:19 +02:00
336ffb8377
Merge commit '95e8ac60f8b7317ce23c648250fdc8fb68d65a07'
...
* commit '95e8ac60f8b7317ce23c648250fdc8fb68d65a07':
build: normalize coverage.info
Conflicts:
tests/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 10:36:23 +02:00
fbede75a25
Merge commit '768e44d044bc32de1e58c198a3708d186af7e966'
...
* commit '768e44d044bc32de1e58c198a3708d186af7e966':
build: tune down the output of lcov/gcov
Conflicts:
tests/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 10:18:41 +02:00
d82729e5d9
Detect and skip mj2-style jp2c header.
...
This this fixes one of the issues with
http://blogs.bu.edu/mhirsch/files/2012/08/Rotate180CCW-checkerboard.mj2_.zip
and at least allows to demux the file properly instead
of failing during probing.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2013-05-05 10:01:22 +02:00
3bb1c58e95
Avoid incorrect deprecated pixel format warning.
...
Should only be printed if a "JPEG" format was used,
not for e.g. XYZ.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2013-05-05 10:01:22 +02:00
1ef82cc60d
AAC encoder: Fix rate control on twoloop.
...
Fixes a case where multichannel bitrate isn't accurately
targetted by psy model alone, never achieving the target bitrate.
Now fixed.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 04:19:34 +02:00
c545876d1b
AAC encoder: Fixed a rounding bug in psy's channel bitrate computation.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 01:24:57 +02:00
adaa7743f5
src_movie: fix scanf string
...
Fixes out of array accesses
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 00:56:39 +02:00
369a120826
xbmdec: fix off by one error in scanf()
...
Fixes out of array access
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 00:27:18 +02:00
2cca96e670
configure: Check for getenv
...
When targeting the "windows store application" (metro) API subset
(or the windows phone API subset), the getenv function isn't
available. If it is unavailable, just define getenv to NULL.
The check uses check_func_headers, since the function actually
might exist in the libraries, but is hidden in the headers.
The fallback is in config.h since msvc can't do -D defines with
parameters on the command line, and it's used both within the
libraries and the frontend applications (so a libavutil internal
header wouldn't be enough).
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-05-04 23:58:59 +03:00
2b677ffca5
swscale: Add av_cold attributes to init functions missing them
2013-05-04 22:48:05 +02:00
1fda184a85
avutil: Add av_cold attributes to init functions missing them
2013-05-04 22:48:05 +02:00
20c86571cc
lavfi: let gcc realign the stack on public graph driving functions
...
The functions which actually drive the filter graph by pushing
frames through it need to ensure an aligned stack for SIMD functions.
This fixes a crash in YADIF filter when using a mingw build in a MSVC
application.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-05-04 23:40:13 +03:00
c0c2b96c13
sctp: Add a note on why sctp_recvmsg and sctp_sendmsg have ff_-prefixes
2013-05-04 22:22:17 +02:00
a8a45dfe25
avs: Increase magic value score above file extension score
...
This should fix misdetection of AVS files as AviSynth scripts
when AviSynth support is enabled (Bugzilla #357 ).
2013-05-04 21:51:00 +02:00
e0f8be6413
avformat: Add AVPROBE_SCORE_EXTENSION define and use where appropriate
2013-05-04 21:43:06 +02:00
4d7ed3e735
build: output-example: Add avutil to ELIBS in link command
...
output-example links against swscale, which depends on avutil. In standard
configurations, by pure good luck, the libs before swscale pull in all of
swscale's dependencies and linking succeeds. However, in some configurations
like --disable-asm this is not the case and linking fails.
Hardcode the dependency to avoid a more general Makefile refactoring.
2013-05-04 21:19:49 +02:00
e445647b4f
avresample: Add av_cold attributes to init functions missing them
2013-05-04 21:10:05 +02:00
093804a93c
avfilter: Add av_cold attributes to init/uninit functions
2013-05-04 21:10:05 +02:00
6fee1b90ce
avcodec: Add av_cold attributes to init functions missing them
2013-05-04 21:09:45 +02:00
c40f51e15b
h264: Always decode MMCOs into temprary array
...
When decoding succeeded the array is copied into the permanent one.
This prevents inconsistencies
Fixes assertion failure
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-04 20:23:05 +02:00
72e228b274
nut: K&R formatting cosmetics
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-05-04 20:01:08 +02:00
30db867cb7
Merge remote-tracking branch 'cigaes/master'
...
* cigaes/master:
lavf/matroskaenc: return an error for unsupported types.
lavf/concatdec: remove invalid check for AVSEEK_FLAG_BACKWARD.
lavf: filter out AVSEEK_FLAG_BACKWARD in new API.
lavf: call the new seek API from the old.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-04 17:10:48 +02:00
c7a7605656
wmaprodec: Fix null pointer dereference in decode_frame()
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-04 16:51:01 +02:00
e9e207ece7
dfa: Put our pointer check back.
...
The reimplementation by Libav does not prevent out of array
writes, even though it looks like it does at a quick glance.
No FFmpeg releases are affected by this
See: d1c95d2ce33623589edc740ebe468c
2013-05-04 14:42:19 +02:00
fa245e432b
lavf/matroskaenc: return an error for unsupported types.
2013-05-04 14:12:57 +02:00
d608a27d9e
lavf/concatdec: remove invalid check for AVSEEK_FLAG_BACKWARD.
2013-05-04 14:11:53 +02:00
3fc66dfef2
lavf: filter out AVSEEK_FLAG_BACKWARD in new API.
...
Also document that it has no effect.
2013-05-04 14:11:53 +02:00
Carl Eugen Hoyos
Michael Niedermayer
Rainer Hochecker
highgod0401
Reimar Döffinger
Claudio Freire
Martin Storsjö
Diego Biurrun
Hendrik Leppkes
Luca Barbato
Nicolas George