highgod0401
e215cb5e96
lavfi/unsharp_opencl: use av_opencl_errstr
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 12:08:22 +02:00
highgod0401
41aa199998
lavu/opencl_internal: use av_opencl_errstr
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 12:08:04 +02:00
highgod0401
9a09a9fc43
lavfi/unsharp: fix opencl crash on 64bit linux
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 11:45:40 +02:00
Michael Niedermayer
09602dbe7a
wav_seek_tag: fix integer overflow
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 10:58:31 +02:00
Michael Niedermayer
5cb9093aa8
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
wav: Always seek to an even offset
Conflicts:
libavformat/wavdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 10:47:49 +02:00
Michael Niedermayer
77c85cbd9d
Merge commit '46c1917350f58dfab84e41919e6c02d43950db8c'
...
* commit '46c1917350f58dfab84e41919e6c02d43950db8c':
nut: use a define for the nut version
bgmc: Do not mark ff_bgmc_decode_init() as av_cold
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 10:41:43 +02:00
Michael Niedermayer
b50ab3a4c7
Merge commit 'bd8ac882140a38868c33c000a430a1292a352533'
...
* commit 'bd8ac882140a38868c33c000a430a1292a352533':
avcodec: Add av_cold attributes to end functions missing them
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 10:28:27 +02:00
Michael Niedermayer
5c2ccf83df
Merge commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43'
...
* commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43':
avformat: Add av_cold attributes to init functions missing them
Conflicts:
libavformat/rtpdec_xiph.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 10:19:56 +02:00
Luca Barbato
ac87eaf856
wav: Always seek to an even offset
...
RIFF chunks are aligned to 16bit according to the specification.
Bug-Id:500
CC:libav-stable@libav.org
2013-05-06 09:14:43 +02:00
Luca Barbato
46c1917350
nut: use a define for the nut version
...
Ease switching version in the future and make evident why that value.
2013-05-06 09:14:43 +02:00
Paul B Mahol
f5846dc98c
id3v2: stop ignoring text encoding for chapter titles
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-06 00:54:13 +00:00
Michael Niedermayer
5a9e376049
h264: check mb_width/height
...
Fixes inconsistency that leads to out of array accesses with threads
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 01:58:10 +02:00
Michael Niedermayer
edabbfbaf2
ff_h264_decode_seq_parameter_set: dont set h->sps
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 00:37:47 +02:00
Michael Niedermayer
26482ae716
h264_sei/decode_picture_timing: do not depend on h->sps being set
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 00:35:25 +02:00
Michael Niedermayer
ccdaa31d86
ff_h264_decode_picture_parameter_set: fix return code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 00:01:47 +02:00
Michael Niedermayer
dc35b77b28
ff_h264_decode_picture_parameter_set: use the correct sps
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 00:01:05 +02:00
Diego Biurrun
2d5fd7886a
bgmc: Do not mark ff_bgmc_decode_init() as av_cold
...
The function is possibly called once per block.
2013-05-05 20:51:52 +02:00
Diego Biurrun
bd8ac88214
avcodec: Add av_cold attributes to end functions missing them
2013-05-05 20:51:28 +02:00
Carl Eugen Hoyos
7c23922c2b
Cosmetics: Reindent Sierra vmd demuxer after last commit.
2013-05-05 19:56:46 +02:00
Carl Eugen Hoyos
4ec509ce3d
Support demuxing of audio-only vmd files.
...
Reviewed-by: Paul B Mahol
2013-05-05 19:52:30 +02:00
Carl Eugen Hoyos
a07ac1f788
Fix type of shared flac table ff_flac_blocksize_table[].
...
Fixes ticket #2533 .
2013-05-05 19:29:00 +02:00
Diego Biurrun
7abd35a1ff
avformat: Add av_cold attributes to init functions missing them
2013-05-05 18:33:04 +02:00
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Rainer Hochecker
fe1f36547d
register AV_PIX_FMT_VDPAU for hwaccel
2013-05-05 16:15:41 +02:00
Rainer Hochecker
b37cc5995b
fix vdpau vc1 interlace modes
2013-05-05 15:12:59 +02:00
Michael Niedermayer
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
highgod0401
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Reimar Döffinger
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
Reimar Döffinger
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
Claudio Freire
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
Claudio Freire
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