]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Thu, 11 Oct 2012 19:26:05 +0000 (21:26 +0200)]
sanm: fix off by 1 error in draw_glyph()
This fix changes nothing as nothing passed a so large value
Fixes CID733785
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 19:16:09 +0000 (21:16 +0200)]
update_initial_timestamps: increase pts_buffer size
Fixes CID733786
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Thu, 11 Oct 2012 19:37:25 +0000 (19:37 +0000)]
bethsoftvid: check return value of av_packet_new_side_data()
Fixes null pointer dereference, fixes CID733777.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Thu, 11 Oct 2012 17:56:04 +0000 (17:56 +0000)]
bmp: unbreak non BMP_RGB compression for v4 and v5
Fixes CID733728 & CID733729.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Clément Bœsch [Thu, 11 Oct 2012 16:41:07 +0000 (18:41 +0200)]
lavfi/ebur128: fix typo in condition.
Fixes CID733727.
Michael Niedermayer [Thu, 11 Oct 2012 16:27:06 +0000 (18:27 +0200)]
random_seed: fix digest size
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 16:27:21 +0000 (18:27 +0200)]
random_seed: fix out of array read
Fixes CID733787
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 16:13:13 +0000 (18:13 +0200)]
yuv2rgb: fix declared array sizes, so they match actuals.
Fixes CID733789, and others
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 15:45:36 +0000 (17:45 +0200)]
jpeglsenc: favor av_freep() for saftey over av_free() when a variable is still accessible afterwards
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 15:44:58 +0000 (17:44 +0200)]
jpeglsnec: fix memleak of state in error case
Fixes CID733794
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 15:41:36 +0000 (17:41 +0200)]
libvpxenc: fix memleak on error path
Fixes CID733795
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 15:09:57 +0000 (17:09 +0200)]
av_tempfile: fix leak in error case
Fixes CID733796 Part2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 15:05:04 +0000 (17:05 +0200)]
libxvid_rc: fix leaks in ff_xvid_rate_control_init()
Fixes CID733796 Part1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 14:51:08 +0000 (16:51 +0200)]
tiff: fix leak on error return in doubles2str()
Fixes CID733797
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 14:48:25 +0000 (16:48 +0200)]
af_aresample: fix leak on alloc failure
Fixes CID733798
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 14:45:50 +0000 (16:45 +0200)]
drawtext: fix leak with timecodes
Fixes CID733799
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 13:54:37 +0000 (15:54 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mlpdsp: adding missing file
dsputil: split out mlp dsp function
sh4: add required #include, fix build
averror: make error values proper negative values
build: do not use LIB as variable name
build: whitespace cosmetics
build: remove single-use variable THIS_LIB
Conflicts:
libavutil/error.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 13:41:56 +0000 (15:41 +0200)]
Merge commit '
4436f25a1682ada3f7226cb6fadf429946933161 '
* commit '
4436f25a1682ada3f7226cb6fadf429946933161 ':
build: remove references to unused EXTRAOBJS variable
lavfi: convert input/ouput list compound literals to named objects
fate: add h263 obmc vsynth tests
avconv: remove bogus warning when using avconv -h without parameter
averror: explicitly define AVERROR_* values
flashsv: propagate inflateReset() errors
indeo4/5: remove constant parameter num_bands from wavelet recomposition
mxfdec: return error if no segments are available in mxf_get_sorted_table_segments
Double motion vector range for HPEL interlaced picture in proper place
Conflicts:
libavcodec/v210dec.h
libavfilter/af_aformat.c
libavfilter/af_amix.c
libavfilter/af_asyncts.c
libavfilter/af_channelmap.c
libavfilter/af_join.c
libavfilter/asrc_anullsrc.c
libavfilter/buffersrc.c
libavfilter/f_setpts.c
libavfilter/f_settb.c
libavfilter/fifo.c
libavfilter/src_movie.c
libavfilter/vf_ass.c
libavfilter/vf_blackframe.c
libavfilter/vf_boxblur.c
libavfilter/vf_delogo.c
libavfilter/vf_drawbox.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
libavfilter/vf_fieldorder.c
libavfilter/vf_fps.c
libavfilter/vf_hflip.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
libavfilter/vf_select.c
libavfilter/vf_transpose.c
libavfilter/vf_yadif.c
libavfilter/vsrc_testsrc.c
libavformat/mxfdec.c
libavutil/error.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 12:36:30 +0000 (14:36 +0200)]
Merge commit '
eb657ecefdeb8b2ed9bfb55d3c2c9e0f568486bf '
* commit '
eb657ecefdeb8b2ed9bfb55d3c2c9e0f568486bf ':
vc1dec: Set opposite to the correct value for 1REF field pictures
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 12:32:37 +0000 (14:32 +0200)]
Merge commit '
7cc3c4e1d4179aeabcd891090e31ee5e5bfd9692 '
* commit '
7cc3c4e1d4179aeabcd891090e31ee5e5bfd9692 ':
vc1dec: Invoke edge emulation regardless of MV precision for 1-MV chroma
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 12:28:18 +0000 (14:28 +0200)]
Merge commit '
88058d9a994f42e4e9ed4e67baf696bbfe53128c '
* commit '
88058d9a994f42e4e9ed4e67baf696bbfe53128c ':
vc1dec: Set chroma reference field from REFFIELD for 1REF field pictures
segment: support applehttp style list
Conflicts:
libavformat/segment.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 11:58:29 +0000 (13:58 +0200)]
Merge commit '
b522000e9b2ca36fe5b2751096b9a5f5ed8f87e6 '
* commit '
b522000e9b2ca36fe5b2751096b9a5f5ed8f87e6 ':
avio: introduce avio_closep
mpegtsenc: set muxing type notification to verbose
vc1dec: Use correct spelling of "opposite"
a64multienc: change mc_frame_counter to unsigned
arm: call arm-specific rv34dsp init functions under if (ARCH_ARM)
svq1: Drop a bunch of useless parentheses
parseutils-test: do not print numerical error codes
svq1: K&R formatting cosmetics
Conflicts:
doc/APIchanges
libavcodec/svq1dec.c
libavcodec/svq1enc.c
libavformat/version.h
libavutil/parseutils.c
tests/ref/fate/parseutils
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Thu, 11 Oct 2012 10:34:36 +0000 (12:34 +0200)]
mlpdsp: adding missing file
Luca Barbato [Thu, 11 Oct 2012 00:01:41 +0000 (02:01 +0200)]
dsputil: split out mlp dsp function
Mans Rullgard [Thu, 11 Oct 2012 01:08:24 +0000 (02:08 +0100)]
sh4: add required #include, fix build
Signed-off-by: Mans Rullgard <mans@mansr.com>
Stefano Sabatini [Thu, 11 Oct 2012 09:19:18 +0000 (11:19 +0200)]
Revert "configure: link flite against libasound"
This reverts commit
396648cc6a3eb5c00c698555fa4ddd631bf6664d .
The commit made impossible to build against libflite if libasound is not
available (e.g. on Windows). Thus remove the -lasound flag. In case of
libflite static linking the workaround is to enable
--extra-ldflags=-lasound (or disable the ALSA output device in libflite).
Stefano Sabatini [Fri, 5 Oct 2012 21:29:11 +0000 (23:29 +0200)]
configure: link flite against libasound
libflite depends on libasound. Fix a linking failure when linking against
a static version of libflite.
Reported-by: Vladimir Kraljevic
Paul B Mahol [Wed, 10 Oct 2012 16:31:51 +0000 (16:31 +0000)]
pcx: convert to bytestream2 API
Protects against overreads in input buffer.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Thu, 11 Oct 2012 02:42:52 +0000 (04:42 +0200)]
av_opt_set_from_string: fix memleak
Fixes CID733801
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 02:36:23 +0000 (04:36 +0200)]
swri_resample_init: unsupported sample formats are an internal error.
This condition cannot happen.
Fixes CID733802
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 02:00:16 +0000 (04:00 +0200)]
ffmpeg_opt: dont fail for sameq/same_quant.
Instead print a warning.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 01:33:34 +0000 (03:33 +0200)]
ffprobe: fix use of uninitialized pointer in av_strtok()
Fixes CID733837
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 01:12:40 +0000 (03:12 +0200)]
af_volumedetect: fix use of uninitilaized variable in case of planar audio.
Fixes: CID733841
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 01:00:34 +0000 (03:00 +0200)]
asrc_aevalsrc: Fix use of uninitialized pointer inside av_strtok()
Fixes CID733842
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 00:42:18 +0000 (02:42 +0200)]
sha: change loop condition to be tighter.
This makes no change to the way the code functions, but should make
it easier for static analyzers to see the valid range for i
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 00:16:52 +0000 (02:16 +0200)]
swscale-test: fix freeing of uninitialized variable
Fixes: CID733844
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Matthieu Bouron [Wed, 10 Oct 2012 08:52:44 +0000 (10:52 +0200)]
fate: add vf_idet filter to lavfi regression tests
This test only make sure that the idet filter does not crash.
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 10 Oct 2012 22:47:46 +0000 (00:47 +0200)]
vf_idet: zero pointers after freeing references
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 10 Oct 2012 22:47:15 +0000 (00:47 +0200)]
vf_idet: fix free after use
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Wed, 10 Oct 2012 20:25:51 +0000 (22:25 +0200)]
averror: make error values proper negative values
Fixes stupid mistake in
25227c3a78fefd74bc6ea34032cd49ec8c8d9d85 .
Mans Rullgard [Wed, 10 Oct 2012 21:36:54 +0000 (22:36 +0100)]
build: remove references to unused EXTRAOBJS variable
This was part of a ghastly hack that is long since gone.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Wed, 10 Oct 2012 22:02:57 +0000 (23:02 +0100)]
build: do not use LIB as variable name
The Microsoft linker uses the LIB environment variable which
clashes with a make variable of the same name.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Wed, 10 Oct 2012 22:00:00 +0000 (23:00 +0100)]
build: whitespace cosmetics
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Wed, 10 Oct 2012 21:59:37 +0000 (22:59 +0100)]
build: remove single-use variable THIS_LIB
Replace the single use of THIS_LIB with its value.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Carl Eugen Hoyos [Wed, 10 Oct 2012 21:59:43 +0000 (23:59 +0200)]
Fix broken timestamps for some mp3 in avi samples.
Mostly based on
73ad355 by Michael Niedermayer.
Fixes ticket #606.
Mans Rullgard [Tue, 24 Jul 2012 13:14:01 +0000 (14:14 +0100)]
lavfi: convert input/ouput list compound literals to named objects
A number of compilers, for example those from TI and IBM, choke on
these initialisers. The current style is also quite ugly.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Michael Niedermayer [Wed, 10 Oct 2012 19:41:20 +0000 (21:41 +0200)]
lavf: do not prematurely accept a format with low score in init_input()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 10 Oct 2012 19:40:03 +0000 (21:40 +0200)]
img2dec: detect .raw files only with a low score as img2
They can be many other things and this otherwise breaks probing of some .raw files.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 10 Oct 2012 19:39:19 +0000 (21:39 +0200)]
lavf: add a AVPROBE_SCORE_RETRY instead of using hardcoded values.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Wed, 10 Oct 2012 12:22:57 +0000 (14:22 +0200)]
fate: add h263 obmc vsynth tests
Janne Grunau [Wed, 10 Oct 2012 18:35:26 +0000 (20:35 +0200)]
avconv: remove bogus warning when using avconv -h without parameter
Janne Grunau [Wed, 10 Oct 2012 18:11:56 +0000 (20:11 +0200)]
averror: explicitly define AVERROR_* values
Janne Grunau [Wed, 10 Oct 2012 17:47:05 +0000 (19:47 +0200)]
flashsv: propagate inflateReset() errors
Fixes CID717493.
Janne Grunau [Wed, 10 Oct 2012 17:16:09 +0000 (19:16 +0200)]
indeo4/5: remove constant parameter num_bands from wavelet recomposition
Fixes bogus uninitialized value compiler and coverity warnings.
Janne Grunau [Tue, 9 Oct 2012 19:45:23 +0000 (21:45 +0200)]
mxfdec: return error if no segments are available in mxf_get_sorted_table_segments
Fixes CID732275.
Mashiat Sarker Shakkhar [Tue, 9 Oct 2012 19:38:19 +0000 (19:38 +0000)]
Double motion vector range for HPEL interlaced picture in proper place
The existing code is not in the right place and it should cover both
interlaced frame and field pictures.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Mashiat Sarker Shakkhar [Tue, 9 Oct 2012 19:38:18 +0000 (19:38 +0000)]
vc1dec: Set opposite to the correct value for 1REF field pictures
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Mashiat Sarker Shakkhar [Tue, 9 Oct 2012 19:38:16 +0000 (19:38 +0000)]
vc1dec: Invoke edge emulation regardless of MV precision for 1-MV chroma
This is required due to the way VC-1 handles chroma pull-back which may end
up causing negative chroma MV for zero luma MV. Edge emulation needs to be
invoked in such cases.
This only affects vertical component of chroma motion vector.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Mashiat Sarker Shakkhar [Tue, 9 Oct 2012 19:38:15 +0000 (19:38 +0000)]
vc1dec: Set chroma reference field from REFFIELD for 1REF field pictures
Interlaced field pictures can have one or two reference pictures, signaled
by NUMREF syntax element. For single reference pictures, reference picture
is determined by REFFIELD syntax element.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Luca Barbato [Tue, 9 Oct 2012 23:39:06 +0000 (01:39 +0200)]
avio: introduce avio_closep
Luca Barbato [Tue, 9 Oct 2012 00:49:42 +0000 (02:49 +0200)]
segment: support applehttp style list
Luca Barbato [Tue, 9 Oct 2012 20:00:22 +0000 (22:00 +0200)]
mpegtsenc: set muxing type notification to verbose
Michael Niedermayer [Wed, 10 Oct 2012 16:36:59 +0000 (18:36 +0200)]
lavc: docs: the field_order is set by the demuxer and not libavcodec for decoding
This makes the documentation match the implementation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 10 Oct 2012 15:30:21 +0000 (17:30 +0200)]
qt-faststart: fix printf argument type
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Wed, 10 Oct 2012 16:46:45 +0000 (16:46 +0000)]
txd: remove duplicated header inclusion
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Wed, 10 Oct 2012 14:41:49 +0000 (14:41 +0000)]
dtshd: fix seeking
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Wed, 10 Oct 2012 15:06:12 +0000 (17:06 +0200)]
avidec: fix 10l typo
found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 10 Oct 2012 14:36:46 +0000 (16:36 +0200)]
avidec: override sample size of 1024 for VBR AAC
Fixes Ticket1755
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Matthieu Bouron [Wed, 10 Oct 2012 08:52:42 +0000 (10:52 +0200)]
vf_idet: remove some unnecessary statement and unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mashiat Sarker Shakkhar [Tue, 9 Oct 2012 20:38:17 +0000 (16:38 -0400)]
vc1dec: Use correct spelling of "opposite"
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Janne Grunau [Thu, 20 Sep 2012 09:34:35 +0000 (09:34 +0000)]
a64multienc: change mc_frame_counter to unsigned
GCC cannot proof that c->mc_frame_counter is always >- 0, changing the
type from int to unsigned fixes following warning:
libavcodec/a64multienc.c: In function ‘a64multi_encode_frame’:
libavcodec/a64multienc.c:342:17: warning: ‘buf’ may be used uninitialized in this function[-Wuninitialized]
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Jean-Baptiste Kempf [Fri, 5 Oct 2012 09:12:04 +0000 (09:12 +0000)]
arm: call arm-specific rv34dsp init functions under if (ARCH_ARM)
Assign NEON specific function pointers after runtime check via
av_get_cpu_flags().
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Diego Biurrun [Wed, 10 Oct 2012 12:08:21 +0000 (14:08 +0200)]
svq1: Drop a bunch of useless parentheses
Paul B Mahol [Wed, 10 Oct 2012 12:50:22 +0000 (12:50 +0000)]
takdec: fix seeking
The previous approach was just wrong.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Mans Rullgard [Wed, 10 Oct 2012 11:51:04 +0000 (12:51 +0100)]
parseutils-test: do not print numerical error codes
The error codes differ between systems so printing the value makes
the fate test fail on some systems.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diego Biurrun [Sun, 19 Aug 2012 20:56:02 +0000 (22:56 +0200)]
svq1: K&R formatting cosmetics
Michael Niedermayer [Wed, 10 Oct 2012 12:13:51 +0000 (14:13 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: sanitize linking of tools and test programs
fate: Refactor setting of environment variables for groups of tests
Conflicts:
tests/fate/audio.mak
tests/fate/real.mak
tests/fate/voice.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 10 Oct 2012 12:04:03 +0000 (14:04 +0200)]
Merge commit '
6d0beefbf6ee6dbf8efb522a9307e54c6ed5f702 '
* commit '
6d0beefbf6ee6dbf8efb522a9307e54c6ed5f702 ':
swscale: Do not make ff_ symbols globally visible.
rtspdec: use av_strlcpy for writing into fixed size buffer
g722enc: fix size argument in memset
http: use av_strlcpy instead of strcpy() without size checks
avfilter: correct memcpy size avfilter_copy_buf_props()
lavc: split asv12 encoder/decoder
Conflicts:
libavcodec/asvdec.c
libavfilter/buffer.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 10 Oct 2012 11:51:07 +0000 (13:51 +0200)]
Merge commit '
fb722a900fc5cc9e003b9fef25b27ed7fc5547a2 '
* commit '
fb722a900fc5cc9e003b9fef25b27ed7fc5547a2 ':
avconv: remove -same_quant
Conflicts:
Changelog
doc/faq.texi
ffmpeg.c
ffmpeg.h
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Wed, 10 Oct 2012 11:23:57 +0000 (11:23 +0000)]
dtshd: remove redundant/wrong avio_tell()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Wed, 10 Oct 2012 11:21:34 +0000 (11:21 +0000)]
takdec: remove redundant/wrong avio_tell()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Wed, 10 Oct 2012 11:18:05 +0000 (13:18 +0200)]
Merge commit '
b94e4acb4874843e914fd3cb8e089aff0756bb4a '
* commit '
b94e4acb4874843e914fd3cb8e089aff0756bb4a ':
cmdutils_read_file: increment *size after writing the trailing \0
af_resample: unref out_buf when avresample_convert returns 0
af_amix: prevent memory leak on error path
vc1dec: prevent memory leak in error path
vc1dec: prevent memory leak on av_realloc error
af_channelmap: free old extended_data on reallocation
avconv: simplify memory allocation in copy_chapters
matroskaenc: check cue point validity before reallocation
swfenc: error out for more than 1 audio or video stream
build: link test programs only against static libs
Conflicts:
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 10 Oct 2012 11:00:28 +0000 (13:00 +0200)]
Merge commit '
cbcd497f384f0f8ef3f76f85b29b644b900d6b9f '
* commit '
cbcd497f384f0f8ef3f76f85b29b644b900d6b9f ':
adxdec: use planar sample format
adpcmdec: use planar sample format for adpcm_thp
adpcmdec: use planar sample format for adpcm_ea_xas
adpcmdec: use planar sample format for adpcm_ea_r1/r2/r3
adpcmdec: use planar sample format for adpcm_xa
adpcmdec: use planar sample format for adpcm_ima_ws for vqa version 3
adpcmdec: use planar sample format for adpcm_4xm
adpcmdec: use planar sample format for adpcm_ima_wav
adpcmdec: use planar sample format for adpcm_ima_qt
pcmdec: use planar sample format for pcm_lxf
mace: use planar sample format
atrac1: use planar sample format
build: non-x86: Only compile mpegvideo optimizations when necessary
rtpdec_mpeg4: au_headers is a single array, simple av_free is enough
avcodec: free extended_data instead address of it
fate: Add tests of the ff_make_absolute_url function
url: Handle relative urls starting with two slashes
url: Handle relative urls being just a new query string
url: Don't treat slashes in query parameters as directory separators
Conflicts:
libavcodec/adxdec.c
libavcodec/mips/Makefile
libavcodec/pcm.c
libavcodec/utils.c
libavformat/Makefile
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Wed, 10 Oct 2012 02:24:50 +0000 (03:24 +0100)]
build: sanitize linking of tools and test programs
This makes sure proper linker arguments are used for the tools and
test programs when shared libraries are enabled. The tools are
linked using the usual -l flag while for test programs the full
name of the static library is used.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diego Biurrun [Fri, 5 Oct 2012 12:27:44 +0000 (14:27 +0200)]
fate: Refactor setting of environment variables for groups of tests
Paul B Mahol [Wed, 10 Oct 2012 07:49:03 +0000 (07:49 +0000)]
pcx: use meaningful return values
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Wed, 10 Oct 2012 02:49:41 +0000 (04:49 +0200)]
x86/dsputil_mmx: change assert() to av_assert()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Thu, 4 Oct 2012 17:22:27 +0000 (19:22 +0200)]
swscale: Do not make ff_ symbols globally visible.
Duncan Salerno [Tue, 9 Oct 2012 18:13:14 +0000 (19:13 +0100)]
crypto should allow passing of options to the underlying protocol via the url_open2 interface
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Tue, 9 Oct 2012 20:34:35 +0000 (22:34 +0200)]
lavfi/silencedetect: add av_opt_free() call.
This avoids a memleak with noise_str.
Duncan Salerno [Tue, 9 Oct 2012 18:08:53 +0000 (19:08 +0100)]
Fix second use of AVOptions in HLS
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Tue, 9 Oct 2012 19:03:40 +0000 (21:03 +0200)]
rtspdec: use av_strlcpy for writing into fixed size buffer
Fixes CID231347.
Janne Grunau [Tue, 9 Oct 2012 18:56:58 +0000 (20:56 +0200)]
g722enc: fix size argument in memset
Fixes CID700725.
Janne Grunau [Tue, 9 Oct 2012 18:50:50 +0000 (20:50 +0200)]
http: use av_strlcpy instead of strcpy() without size checks
Fixes CID700730.
Janne Grunau [Tue, 9 Oct 2012 18:38:47 +0000 (20:38 +0200)]
avfilter: correct memcpy size avfilter_copy_buf_props()
Does not make a difference in this case since sizeof(uint8_t*) ==
sizeof(uint8_t**). Fixes CID703814.
Anton Khirnov [Mon, 8 Oct 2012 10:03:08 +0000 (12:03 +0200)]
lavc: split asv12 encoder/decoder
Anton Khirnov [Tue, 9 Oct 2012 15:40:20 +0000 (17:40 +0200)]
avconv: remove -same_quant
It has not worked for anything other than fringe codecs (asv1/2, mdec,
mjpeg[b]) since about 2003 and nobody ever noticed or complained. This
sufficiently proves that there are no users of this option who have a
clue of what they are doing, so it is completely useless.
Janne Grunau [Tue, 9 Oct 2012 15:55:32 +0000 (17:55 +0200)]
cmdutils_read_file: increment *size after writing the trailing \0
Fixes CID732166.
Janne Grunau [Tue, 9 Oct 2012 14:28:30 +0000 (16:28 +0200)]
af_resample: unref out_buf when avresample_convert returns 0
Fixes CID732273.
Andrey Utkin [Thu, 13 Sep 2012 00:43:32 +0000 (03:43 +0300)]
http: add 'timeout' AVOption
This option is passed though to underlying tcp protocol context
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>