]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Fri, 5 Apr 2013 20:00:38 +0000 (22:00 +0200)]
Merge commit '
0404ec619d43f27b87c424aa1a572a6699fe6a31 '
* commit '
0404ec619d43f27b87c424aa1a572a6699fe6a31 ':
h261: cosmetics: Move functions to avoid forward declarations
Conflicts:
libavcodec/h261dec.c
libavcodec/h261enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 5 Apr 2013 19:53:57 +0000 (21:53 +0200)]
Merge commit '
b78f81c8033904e2e75add0c9a603df6df514a30 '
* commit '
b78f81c8033904e2e75add0c9a603df6df514a30 ':
h261: K&R formatting and prettyprinting cosmetics
Conflicts:
libavcodec/h261_parser.c
libavcodec/h261data.h
libavcodec/h261dec.c
libavcodec/h261enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 5 Apr 2013 19:31:08 +0000 (21:31 +0200)]
Merge commit '
66ac3dbf1e60c27d0f1d779a424c0b33b7ca3780 '
* commit '
66ac3dbf1e60c27d0f1d779a424c0b33b7ca3780 ':
h261: Move function declarations to h261.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 5 Apr 2013 19:25:31 +0000 (21:25 +0200)]
Merge commit '
ed16c2dbf47cdd7c48825b4da6e7036698e5dde1 '
* commit '
ed16c2dbf47cdd7c48825b4da6e7036698e5dde1 ':
h261: Remove H.261 loop filter from dsputil
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 5 Apr 2013 19:08:58 +0000 (21:08 +0200)]
Merge commit '
ae35d91d44c5e676af3d146bf8d05b241c467675 '
* commit '
ae35d91d44c5e676af3d146bf8d05b241c467675 ':
h261: Move ff_h261_rl_table_store declaration to header file
Merged-by: Michael Niedermayer <michaelni@gmx.at>
highgod0401 [Fri, 5 Apr 2013 04:22:07 +0000 (12:22 +0800)]
fix bug of finding CPU device
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Fri, 5 Apr 2013 15:07:52 +0000 (15:07 +0000)]
img2dec: make use of AV_OPT_TYPE_IMAGE_SIZE
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 5 Apr 2013 15:02:35 +0000 (15:02 +0000)]
img2dec: make use of AV_OPT_TYPE_VIDEO_RATE
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 5 Apr 2013 15:00:16 +0000 (15:00 +0000)]
rawvideodec: make use of AV_OPT_TYPE_IMAGE_SIZE
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 5 Apr 2013 14:56:19 +0000 (14:56 +0000)]
rawvideodec: make use of AV_OPT_TYPE_VIDEO_RATE
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 5 Apr 2013 14:52:52 +0000 (14:52 +0000)]
rawdec: make use of AV_OPT_TYPE_VIDEO_RATE
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 5 Apr 2013 14:46:28 +0000 (14:46 +0000)]
bintext: make use of AV_OPT_TYPE_IMAGE_SIZE
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 5 Apr 2013 14:39:42 +0000 (14:39 +0000)]
bintext: make use of AV_OPT_TYPE_VIDEO_RATE
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Christophe Gisquet [Thu, 4 Apr 2013 19:45:52 +0000 (19:45 +0000)]
x86: sbrdsp: implement SSE neg_odd_64
Timing on Arrandale:
C SSE
Win32: 57 44
Win64: 47 38
Unrolling and not storing mask both save some cycles.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Thu, 4 Apr 2013 19:45:48 +0000 (19:45 +0000)]
x264asm: fix cmp* number of arguments
cmp{p,s}{s,d} instructions do take an imm8 operand.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Fri, 5 Apr 2013 14:30:56 +0000 (14:30 +0000)]
tty: make use of AV_OPT_TYPE_IMAGE_SIZE
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 5 Apr 2013 14:24:40 +0000 (14:24 +0000)]
tty: make use of AV_OPT_TYPE_VIDEO_RATE
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Fri, 5 Apr 2013 10:52:23 +0000 (12:52 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libopenjpeg: Add support for XYZ colorspace, found in DCINEMA frames
Conflicts:
libavcodec/libopenjpegdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Fri, 5 Apr 2013 10:44:22 +0000 (12:44 +0200)]
doc/filters: clarify example explanation
Stefano Sabatini [Fri, 5 Apr 2013 10:42:21 +0000 (12:42 +0200)]
doc/filters: fix old broken syntax of color source in overlay example
Found-By: littlebat <dashing.meng@gmail.com>
Michael Niedermayer [Fri, 5 Apr 2013 10:26:39 +0000 (12:26 +0200)]
Merge commit '
8c65264595d5a82c56ae5043320e4b875a414229 '
* commit '
8c65264595d5a82c56ae5043320e4b875a414229 ':
pixdesc/pixfmt: Add XYZ colorspace for XYZ 12-bit values
img2: Add j2k file extension for JPEG 2000
Conflicts:
libavutil/pixfmt.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Thu, 4 Apr 2013 12:33:55 +0000 (14:33 +0200)]
h261: cosmetics: Move functions to avoid forward declarations
Diego Biurrun [Thu, 4 Apr 2013 12:31:58 +0000 (14:31 +0200)]
h261: K&R formatting and prettyprinting cosmetics
Diego Biurrun [Wed, 3 Apr 2013 18:16:08 +0000 (20:16 +0200)]
h261: Move function declarations to h261.h
Diego Biurrun [Wed, 3 Apr 2013 18:09:58 +0000 (20:09 +0200)]
h261: Remove H.261 loop filter from dsputil
There is no arch-optimized version of the H.261 loop filter and there
likely will never be, so the dsputil overhead does not give any benefit.
Diego Biurrun [Wed, 3 Apr 2013 16:52:30 +0000 (18:52 +0200)]
h261: Move ff_h261_rl_table_store declaration to header file
Stefano Sabatini [Thu, 4 Apr 2013 20:20:08 +0000 (22:20 +0200)]
cmdutils: remove error message from opt_default() in case of missing option
A similar error message is generated by the calling function, avoid
duplication and spurious error message occurring with negated boolean
options introduced in
8bb5680 , which can be reproduced for example with
the command:
ffmpeg -f lavfi -i testsrc=d=0.1 -nostdin -f null -
Stefano Sabatini [Tue, 19 Mar 2013 19:54:26 +0000 (20:54 +0100)]
doc: enable compilation of -all tool pages
In particular, add documentation configuration system, through the
doc/config.texi file.
Fix trac issue #2374.
Stefano Sabatini [Tue, 19 Mar 2013 19:04:57 +0000 (20:04 +0100)]
doc: move ffmpeg-scaler.texi content to separated file
This should simplify inclusion in monolithic tool manuals.
Stefano Sabatini [Tue, 19 Mar 2013 19:03:57 +0000 (20:03 +0100)]
doc: move ffmpeg-resampler.texi content to separated file
This should simplify inclusion in monolithic tool manuals.
Stefano Sabatini [Tue, 19 Mar 2013 19:02:16 +0000 (20:02 +0100)]
doc: move ffmpeg-devices.texi content to separated file
This should simplify inclusion in monolithic tool manuals.
Stefano Sabatini [Sat, 30 Mar 2013 16:02:53 +0000 (17:02 +0100)]
doc: move ffmpeg-formats.texi content to separated file
This should simplify inclusion in monolithic tool manuals.
Stefano Sabatini [Fri, 5 Apr 2013 08:05:26 +0000 (10:05 +0200)]
doc: move ffmpeg-codecs.texi content to separated file
This should simplify inclusion in monolithic tool manuals.
Paul B Mahol [Fri, 5 Apr 2013 00:12:22 +0000 (00:12 +0000)]
lavfi/blend: use standard options parsing
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 5 Apr 2013 00:06:29 +0000 (00:06 +0000)]
lavfi/noise: use standard options parsing
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 5 Apr 2013 00:01:28 +0000 (00:01 +0000)]
lavfi/afade: use standard options parsing
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Andrew Van Til [Thu, 4 Apr 2013 23:46:50 +0000 (01:46 +0200)]
rtpdec: Increase max rtp packet size to 8192
Fixes Ticket2314
Fixes connecting to "Ceton InfiniTV4 PCIe & USB"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andrew Van Til [Thu, 4 Apr 2013 23:45:52 +0000 (01:45 +0200)]
rtsp/rtp_read_header: Use RTP_MAX_PACKET_LENGTH instead of 1500
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Thu, 4 Apr 2013 22:30:54 +0000 (00:30 +0200)]
doc/filters: fix erroneously truncated comment on a scale example
Stefano Sabatini [Thu, 4 Apr 2013 22:29:28 +0000 (00:29 +0200)]
doc/filters: put separated geq variables in separate lines
Make clear that they are not aliases for the same variable.
Paul B Mahol [Sat, 30 Mar 2013 02:54:30 +0000 (02:54 +0000)]
xbmenc: remove unused code
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sat, 30 Mar 2013 02:31:55 +0000 (02:31 +0000)]
xwdenc: remove unused code
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sat, 30 Mar 2013 02:19:36 +0000 (02:19 +0000)]
bmpenc: get rid of BMPContext as it is unused
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Thu, 4 Apr 2013 14:29:14 +0000 (14:29 +0000)]
lavfi/smptebars: fix invalid writes
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sun, 31 Mar 2013 21:14:56 +0000 (23:14 +0200)]
doc: document -v repeat
Thanks-to: Derek Buitenhuis
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 4 Apr 2013 19:19:41 +0000 (21:19 +0200)]
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
lavc: use packet duration for subtitles if necessary.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas Bertrand [Tue, 26 Mar 2013 22:21:15 +0000 (23:21 +0100)]
libopenjpeg: Add support for XYZ colorspace, found in DCINEMA frames
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Nicolas Bertrand [Tue, 26 Mar 2013 22:21:13 +0000 (23:21 +0100)]
pixdesc/pixfmt: Add XYZ colorspace for XYZ 12-bit values
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Nicolas Bertrand [Tue, 26 Mar 2013 22:21:12 +0000 (23:21 +0100)]
img2: Add j2k file extension for JPEG 2000
Signed-off-by: Diego Biurrun <diego@biurrun.de>
highgod0401 [Thu, 4 Apr 2013 12:20:47 +0000 (20:20 +0800)]
avutil/opencl: replace assert by check and error message in av_opencl_init()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
highgod0401 [Thu, 4 Apr 2013 12:11:51 +0000 (20:11 +0800)]
avutil/opencl: check strtol for failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
highgod0401 [Thu, 4 Apr 2013 12:09:17 +0000 (20:09 +0800)]
avutil/opencl: add check for the program number to create kernel
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Thu, 4 Apr 2013 15:29:01 +0000 (15:29 +0000)]
lavfi/blend: add N variable
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Thu, 4 Apr 2013 12:55:41 +0000 (12:55 +0000)]
lavfi/smptebars: fix output for subsampled yuv
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Thu, 4 Apr 2013 13:39:23 +0000 (15:39 +0200)]
matroskadec: Check EBML lace sizes.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 4 Apr 2013 13:17:57 +0000 (15:17 +0200)]
matroskadec: Check for overflows in xiph lace decoding
This also detects errors earlier
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 4 Apr 2013 13:13:53 +0000 (15:13 +0200)]
matroskadec: fix return code for too long xiph laces
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 4 Apr 2013 12:49:00 +0000 (14:49 +0200)]
dfa: remove redundant check
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 4 Apr 2013 12:30:41 +0000 (14:30 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
xmv: do not leak memory in the error paths in xmv_read_header()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 4 Apr 2013 12:20:51 +0000 (14:20 +0200)]
Merge commit '
d1016dccdcb10486245e5d7c186cc31af54b2a9c '
* commit '
d1016dccdcb10486245e5d7c186cc31af54b2a9c ':
xmv: check audio track parameters validity.
bmv: check for len being valid in bmv_decode_frame().
Conflicts:
libavformat/xmv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Sun, 24 Mar 2013 14:52:28 +0000 (15:52 +0100)]
lavc: use packet duration for subtitles if necessary.
Fix trac ticket #2397.
Michael Niedermayer [Thu, 4 Apr 2013 11:41:01 +0000 (13:41 +0200)]
Merge commit '
8d617b11cfc87b2c6056fee029ac5bc760af874a '
* commit '
8d617b11cfc87b2c6056fee029ac5bc760af874a ':
id3v2: pad the APIC packets as required by lavc.
dfa: check for invalid access in decode_wdlt().
Conflicts:
libavformat/id3v2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 4 Apr 2013 11:09:54 +0000 (13:09 +0200)]
Merge commit '
dbb1425811a672eddf4acf0513237cdf20f83756 '
* commit '
dbb1425811a672eddf4acf0513237cdf20f83756 ':
lavf: make sure stream probe data gets freed.
avfiltergraph: set deprecated filter_count.
Conflicts:
libavformat/utils.c
See:
44a7a6300d104dd453bcd5c601e9c6944fb34679
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 4 Apr 2013 11:00:59 +0000 (13:00 +0200)]
Merge commit '
bcc94328980e6c56546792ab08b0756abdce310b '
* commit '
bcc94328980e6c56546792ab08b0756abdce310b ':
opt: check the return values of av_get_token for ENOMEM.
doc: Fix best_nb_channells typo
matroska: pass the lace size to the matroska_parse_rm_audio
Conflicts:
libavformat/matroskadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 4 Apr 2013 10:45:46 +0000 (12:45 +0200)]
Merge commit '
8a96df7b70be509dae9ceec82d2c10a20361356d '
* commit '
8a96df7b70be509dae9ceec82d2c10a20361356d ':
matroska: fix a corner case in ebml-lace parsing
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 4 Apr 2013 10:38:44 +0000 (12:38 +0200)]
Merge commit '
fc43c19a567aa945398dccb491d972c11ec2a065 '
* commit '
fc43c19a567aa945398dccb491d972c11ec2a065 ':
matroska: Update the available size after lace parsing
clang: use -fsantize=address and -fsanitize=thread
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Thu, 4 Apr 2013 08:13:30 +0000 (10:13 +0200)]
doc/ffprobe: fix references in See Also section
Anton Khirnov [Thu, 28 Mar 2013 09:34:47 +0000 (10:34 +0100)]
xmv: do not leak memory in the error paths in xmv_read_header()
CC: libav-stable@libav.org
Anton Khirnov [Thu, 28 Mar 2013 09:33:02 +0000 (10:33 +0100)]
xmv: check audio track parameters validity.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Anton Khirnov [Thu, 28 Mar 2013 09:09:36 +0000 (10:09 +0100)]
bmv: check for len being valid in bmv_decode_frame().
It can be 0 or -1 for invalid files, which may result in invalid memory
access.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Anton Khirnov [Thu, 28 Mar 2013 08:49:38 +0000 (09:49 +0100)]
id3v2: pad the APIC packets as required by lavc.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Anton Khirnov [Wed, 27 Mar 2013 17:18:38 +0000 (18:18 +0100)]
dfa: check for invalid access in decode_wdlt().
This can happen when the number of skipped lines is not consistent with
the number of coded lines.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Anton Khirnov [Wed, 27 Mar 2013 16:56:59 +0000 (17:56 +0100)]
lavf: make sure stream probe data gets freed.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Anton Khirnov [Sat, 30 Mar 2013 21:15:48 +0000 (22:15 +0100)]
avfiltergraph: set deprecated filter_count.
Anton Khirnov [Mon, 25 Feb 2013 11:32:49 +0000 (12:32 +0100)]
opt: check the return values of av_get_token for ENOMEM.
Peter Meerwald [Wed, 3 Apr 2013 12:33:58 +0000 (14:33 +0200)]
doc: Fix best_nb_channells typo
Signed-off-by: Peter Meerwald <p.meerwald@bct-electronic.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Thu, 4 Apr 2013 02:03:07 +0000 (04:03 +0200)]
oggdec: Support byte based seeking
Fixed Ticket2317
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 4 Apr 2013 02:01:12 +0000 (04:01 +0200)]
avformat: Add a mechanism to allow demuxers to detect byte based seeking.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Wed, 3 Apr 2013 21:58:20 +0000 (23:58 +0200)]
Add a work-around for msvc compilation until c99-to-c89 issue 7 is fixed.
Tested-by: Nevcairiel
Michael Niedermayer [Wed, 3 Apr 2013 21:40:13 +0000 (23:40 +0200)]
matroskadec: fix display_width/height = 0 handling
Fixes Ticket2424
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Wed, 3 Apr 2013 19:06:33 +0000 (21:06 +0200)]
doc/fate.texi: fix typo
Paul B Mahol [Wed, 3 Apr 2013 17:06:25 +0000 (17:06 +0000)]
doc/filters: fix error in blend description
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Wed, 3 Apr 2013 16:29:13 +0000 (18:29 +0200)]
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
lavc: do not init frame with guessed layout.
lavfi/af_atempo: simplify request_frame loop.
lavfi/af_asetnsamples: simplify request_frame loop.
lavfi/f_ebur128: remove request_frame hack.
lavfi/vf_tile: simplify request_frame loop.
lavfi: reindent after last commit.
lavfi: loop on request_frame if necessary.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Thu, 14 Mar 2013 18:15:12 +0000 (19:15 +0100)]
lavc: do not init frame with guessed layout.
It is breaking support from files with unknown layout.
Nicolas George [Sun, 31 Mar 2013 17:36:38 +0000 (19:36 +0200)]
lavfi/af_atempo: simplify request_frame loop.
Nicolas George [Sun, 31 Mar 2013 17:34:35 +0000 (19:34 +0200)]
lavfi/af_asetnsamples: simplify request_frame loop.
Nicolas George [Sun, 31 Mar 2013 17:32:45 +0000 (19:32 +0200)]
lavfi/f_ebur128: remove request_frame hack.
Nicolas George [Sun, 31 Mar 2013 17:19:35 +0000 (19:19 +0200)]
lavfi/vf_tile: simplify request_frame loop.
Nicolas George [Wed, 3 Apr 2013 15:43:53 +0000 (17:43 +0200)]
lavfi: reindent after last commit.
Nicolas George [Sun, 31 Mar 2013 17:17:57 +0000 (19:17 +0200)]
lavfi: loop on request_frame if necessary.
Some filters need several input frames before producing output.
For these filter, it becomes simpler to return 0 in
request_frame() and let the framework call it again until
output has been produced.
Carl Eugen Hoyos [Wed, 3 Apr 2013 13:45:46 +0000 (15:45 +0200)]
Skip padding in an id3 tag in aiff files.
Fixes ticket #2430.
Reviewed-by: Matthieu Bouron
Michael Niedermayer [Wed, 3 Apr 2013 13:35:16 +0000 (15:35 +0200)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Fix make checkheaders without opencl headers.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Wed, 3 Apr 2013 13:28:29 +0000 (15:28 +0200)]
Fix make checkheaders without opencl headers.
Michael Niedermayer [Wed, 3 Apr 2013 13:20:05 +0000 (15:20 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avfiltergraph: check for sws opts being non-NULL before using them.
Conflicts:
libavfilter/avfiltergraph.c
libavfilter/graphparser.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Apr 2013 13:08:21 +0000 (15:08 +0200)]
Merge commit '
817dff578f13ce97576c609ab141508b9dc782e9 '
* commit '
817dff578f13ce97576c609ab141508b9dc782e9 ':
configure: Check for the atomic.h functions used in the suncc atomics header
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Wed, 3 Apr 2013 12:57:58 +0000 (12:57 +0000)]
smacker: fix off by one error
Regression since
a93b572ae4f517ce0c35cf085167c318e9215908 .
Fixes #2426.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Wed, 3 Apr 2013 12:46:48 +0000 (14:46 +0200)]
Merge commit '
f9f6402e9c9ce3642df981b48507df3a2d956f65 '
* commit '
f9f6402e9c9ce3642df981b48507df3a2d956f65 ':
configure: prettify atomics handling.
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Wed, 3 Apr 2013 11:10:00 +0000 (11:10 +0000)]
lavfi/afade * biquads: call av_frame_copy_props()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Wed, 3 Apr 2013 10:52:01 +0000 (10:52 +0000)]
lavfi/earwax: clip sample, this is what sox does
Fixes #1884.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Carl Eugen Hoyos [Wed, 3 Apr 2013 10:52:38 +0000 (12:52 +0200)]
vf_deshake: Reorder constant arguments in an if() statement.
Fixes compilation with clang on netbsd with --disable-optimizations.
Tested-by: Paul B Mahol