]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Tue, 7 Aug 2012 21:04:55 +0000 (23:04 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: fix build with nasm 2.08
x86: use nop cpu directives only if supported
x86: fix rNmp macros with nasm
build: add trailing / to yasm/nasm -I flags
x86: use 32-bit source registers with movd instruction
x86: add colons after labels
Conflicts:
Makefile
libavutil/x86/x86inc.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Tue, 7 Aug 2012 03:55:28 +0000 (03:55 +0000)]
gifdec: return more meaningful error codes
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 7 Aug 2012 03:46:33 +0000 (03:46 +0000)]
gifdec: remove redundant "gif: " from av_dlog()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 7 Aug 2012 03:43:55 +0000 (03:43 +0000)]
gifdec: pass avctx to av_log()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Tue, 7 Aug 2012 20:45:46 +0000 (22:45 +0200)]
Merge commit '
36ef5369ee9b336febc2c270f8718cec4476cb85 '
* commit '
36ef5369ee9b336febc2c270f8718cec4476cb85 ':
Replace all CODEC_ID_* with AV_CODEC_ID_*
lavc: add AV prefix to codec ids.
Conflicts:
doc/APIchanges
doc/examples/decoding_encoding.c
doc/examples/muxing.c
ffmpeg.c
ffprobe.c
ffserver.c
libavcodec/8svx.c
libavcodec/avcodec.h
libavcodec/dnxhd_parser.c
libavcodec/dvdsubdec.c
libavcodec/error_resilience.c
libavcodec/h263dec.c
libavcodec/libvorbisenc.c
libavcodec/mjpeg_parser.c
libavcodec/mjpegenc.c
libavcodec/mpeg12.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/pcm.c
libavcodec/r210dec.c
libavcodec/utils.c
libavcodec/v210dec.c
libavcodec/version.h
libavdevice/alsa-audio-dec.c
libavdevice/bktr.c
libavdevice/v4l2.c
libavformat/asfdec.c
libavformat/asfenc.c
libavformat/avformat.h
libavformat/avidec.c
libavformat/caf.c
libavformat/electronicarts.c
libavformat/flacdec.c
libavformat/flvdec.c
libavformat/flvenc.c
libavformat/framecrcenc.c
libavformat/img2.c
libavformat/img2dec.c
libavformat/img2enc.c
libavformat/ipmovie.c
libavformat/isom.c
libavformat/matroska.c
libavformat/matroskadec.c
libavformat/matroskaenc.c
libavformat/mov.c
libavformat/movenc.c
libavformat/mp3dec.c
libavformat/mpeg.c
libavformat/mpegts.c
libavformat/mxf.c
libavformat/mxfdec.c
libavformat/mxfenc.c
libavformat/nsvdec.c
libavformat/nut.c
libavformat/oggenc.c
libavformat/pmpdec.c
libavformat/rawdec.c
libavformat/rawenc.c
libavformat/riff.c
libavformat/sdp.c
libavformat/utils.c
libavformat/vocenc.c
libavformat/wtv.c
libavformat/xmv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
jamal [Fri, 3 Aug 2012 20:13:27 +0000 (17:13 -0300)]
build: Fix some paths in uninstall-libs
Folder and file names weren't being separated with a slash.
This resulted in .dll.a, .lib and .def files not being removed on uninstall.
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
jamal [Sun, 15 Jul 2012 20:30:40 +0000 (17:30 -0300)]
checkheaders: Fix directory creation in out-of-tree builds.
checkheaders wasn't creating folders as needed, so if it was run
immediately after the configure script it would fail as soon as
it tried to compile headers inside the ARCH folders.
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Michael Niedermayer [Tue, 7 Aug 2012 19:49:00 +0000 (21:49 +0200)]
Merge commit '
f5d2c597e99af218b0d4d1cf9737c7e68ee934e4 '
* commit '
f5d2c597e99af218b0d4d1cf9737c7e68ee934e4 ':
build: fix library installation on cygwin
mpc8: add a flush function
mpc8: set packet duration and stream start time instead of tracking frames
Conflicts:
libavformat/mpc8.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 7 Aug 2012 18:58:25 +0000 (20:58 +0200)]
pnmdec: make ff_pnm_decode_header() more robust
Fixes ticket1321
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 7 Aug 2012 18:57:40 +0000 (20:57 +0200)]
pnmdec: make pnm_get more robust
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Derek Buitenhuis [Tue, 7 Aug 2012 16:52:16 +0000 (12:52 -0400)]
configure: Add support for e500mc CPU
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Wed, 20 Jun 2012 01:54:58 +0000 (01:54 +0000)]
lavfi: add smptebars source
Patch readapted by Stefano Sabatini, color values proposed by Tim
Nicholson <nichot20@yahoo.com>.
Address trac ticket #1462.
See thread:
Subject: [FFmpeg-devel] [PATCH] smptebars filter
Date: Wed, 20 Jun 2012 01:54:58 +0000
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Stefano Sabatini [Fri, 3 Aug 2012 15:57:45 +0000 (17:57 +0200)]
examples/muxing: set codec in the codec context
Make add_{audio,video}_stream return the found codec, and pass it to
avcodec_open2() through open_{audio,video} functions.
Fix failure:
No codec provided to avcodec_open2().
could not open codec
This is also consistent with the use of the avcodec_open2() API in the
codebase.
Michael Niedermayer [Tue, 7 Aug 2012 17:18:53 +0000 (19:18 +0200)]
avidec: fix AVStream.info memleak with dv.
Fixes Ticket1334
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 7 Aug 2012 15:59:19 +0000 (17:59 +0200)]
mpeg12dec: move checks out of decode picture coding extension.
Fixes out of array reads
Fixes Ticket1330
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Mon, 6 Aug 2012 01:26:15 +0000 (02:26 +0100)]
x86: fix build with nasm 2.08
It appears that something goes wrong in old nasm versions when the
%+ operator is used in the last argument of a macro invocation and
this argument is tested with %ifdef within the macro. This patch
rearranges the macro arguments such that the %+ operator is never
used in the last argument.
Mans Rullgard [Sun, 5 Aug 2012 23:34:51 +0000 (00:34 +0100)]
x86: use nop cpu directives only if supported
nasm does not support 'CPU foonop' directives. This adds a configure
test for the directive and uses it only if supported.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sun, 5 Aug 2012 23:21:36 +0000 (00:21 +0100)]
x86: fix rNmp macros with nasm
For some reason, nasm requires this. No harm done to yasm.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sun, 5 Aug 2012 23:17:40 +0000 (00:17 +0100)]
build: add trailing / to yasm/nasm -I flags
nasm requires a trailing / on paths specified with -I.
It does no harm with yasm.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sun, 5 Aug 2012 23:16:13 +0000 (00:16 +0100)]
x86: use 32-bit source registers with movd instruction
yasm tolerates mismatch between movd/movq and source register size,
adjusting the instruction according to the register. nasm is more
strict.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sun, 5 Aug 2012 23:09:48 +0000 (00:09 +0100)]
x86: add colons after labels
nasm prints a warning if the colon is missing.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Anton Khirnov [Sun, 5 Aug 2012 09:11:04 +0000 (11:11 +0200)]
Replace all CODEC_ID_* with AV_CODEC_ID_*
Anton Khirnov [Sun, 5 Aug 2012 08:36:55 +0000 (10:36 +0200)]
lavc: add AV prefix to codec ids.
Yaakov Selkowitz [Mon, 6 Aug 2012 23:32:48 +0000 (00:32 +0100)]
build: fix library installation on cygwin
This installs libraries using the proper names and locations,
generates an import lib for the DLL, and drops no longer needed
linker flags.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Michael Niedermayer [Tue, 7 Aug 2012 11:26:40 +0000 (13:26 +0200)]
arm: fix compile with disable-optimizations on android
Fixes Ticket1241
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Tue, 7 Aug 2012 05:37:37 +0000 (07:37 +0200)]
doc: fix misspelled "convergence".
Found-by: David Rice
Paul B Mahol [Sun, 5 Aug 2012 23:46:41 +0000 (23:46 +0000)]
avcodec: add bmp parser
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Tue, 7 Aug 2012 02:38:44 +0000 (04:38 +0200)]
mpegaudiodec: replace assert() by check under #ifdef DEBUG
The assert can be false with some invalid inputs, the check is
too expensive to always do though for just a warning message.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 6 Aug 2012 23:11:28 +0000 (01:11 +0200)]
proresenc_kostya: do not attempt to free random things
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 6 Aug 2012 22:18:59 +0000 (00:18 +0200)]
h264: disable assert on current_picture_ptr being null.
It is possible in various error pathes as well as gap handling
that this has already been allocated. Its not clear why that
would be a problem with the current code, thus disable the
assert to avoid common assert failure when asserts are enabled.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 6 Aug 2012 20:14:43 +0000 (22:14 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
nuv: K&R formatting cosmetics
build: generalise rules and variable settings for av* programs
nuv: check RTjpeg header for validity
Revert "nuv: check per-frame header for validity."
imc: remove unused field IMCContext.one_div_log2
imc: fix size of a memset()
imc: remove empty if() block
fate: simplify variable setting filter.mak
lavf: Declare an AVRational struct without a struct literal
Conflicts:
Makefile
configure
libavcodec/nuv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 6 Aug 2012 19:07:23 +0000 (21:07 +0200)]
avidec: parse INFO tags at the end
Fixes Ticket1123
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Justin Ruggles [Mon, 6 Aug 2012 17:06:25 +0000 (13:06 -0400)]
mpc8: add a flush function
Ensures that the next frame decoded after seeking will be decoded as a
keyframe.
Justin Ruggles [Mon, 6 Aug 2012 16:38:57 +0000 (12:38 -0400)]
mpc8: set packet duration and stream start time instead of tracking frames
Fixes mpc8 timestamps.
Michael Niedermayer [Mon, 6 Aug 2012 17:34:09 +0000 (19:34 +0200)]
msrle: fix extradata palette handling
Fixes Ticket1273
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Mon, 6 Aug 2012 13:49:51 +0000 (15:49 +0200)]
nuv: K&R formatting cosmetics
Mans Rullgard [Sat, 4 Aug 2012 18:04:08 +0000 (19:04 +0100)]
build: generalise rules and variable settings for av* programs
This simplifies adding extra flags for individual programs
and also allows more than one object file per program.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Nicolas George [Tue, 24 Jul 2012 13:13:02 +0000 (15:13 +0200)]
ffprobe: refactor frames decoding.
Michael Niedermayer [Mon, 6 Aug 2012 14:49:49 +0000 (16:49 +0200)]
mpegvideo: remove last_picture_ptr / h264 assert.
This assert is no longer true since h264 error concealment needs
last_picture_ptr to be set.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 6 Aug 2012 14:40:22 +0000 (16:40 +0200)]
mpegvideo.c: convert some asserts to av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 6 Aug 2012 14:28:13 +0000 (16:28 +0200)]
svq1enc: set picture_structure correctly
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 6 Aug 2012 12:39:40 +0000 (14:39 +0200)]
mpegvideo_enc: switch some assert to av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 6 Aug 2012 08:26:04 +0000 (10:26 +0200)]
mpegvideo_enc: remove assert that has become obsolete with the new API
it now just checks uninitialized and unused data.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Mon, 6 Aug 2012 11:59:04 +0000 (13:59 +0200)]
nuv: check RTjpeg header for validity
CC: libav-stable@libav.org
Janne Grunau [Mon, 6 Aug 2012 11:50:51 +0000 (13:50 +0200)]
Revert "nuv: check per-frame header for validity."
The check is bogus since the nuv frameheader is already skipped
and the (decompressed) RTjpeg header is checked.
This reverts commit
f6afacdb3b708720c9fb85984b4f7fdbca2b2036 .
CC: libav-stable@libav.org
Mans Rullgard [Sun, 5 Aug 2012 21:36:09 +0000 (22:36 +0100)]
imc: remove unused field IMCContext.one_div_log2
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sun, 5 Aug 2012 21:32:20 +0000 (22:32 +0100)]
imc: fix size of a memset()
IMCContext was changed from an array to a pointer in
66b84e4 ,
but this memset() was not updated.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sun, 5 Aug 2012 17:32:03 +0000 (18:32 +0100)]
imc: remove empty if() block
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sun, 5 Aug 2012 11:06:19 +0000 (12:06 +0100)]
fate: simplify variable setting filter.mak
This removes some needless indirection and duplication.
Signed-off-by: Mans Rullgard <mans@mansr.com>
anonymous [Mon, 6 Aug 2012 07:56:50 +0000 (09:56 +0200)]
udp: do not call pthread_{mutex,cond}_destroy when not initialized.
This seems to cause a crash on Windows.
The author of that patch was a random guy on IRC who wants to stay anonymous.
Michael Niedermayer [Mon, 6 Aug 2012 07:24:34 +0000 (09:24 +0200)]
shorten: fix cmd type
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Mon, 6 Aug 2012 01:33:37 +0000 (01:33 +0000)]
mpc7: remove duplicated definitions
They are available in mpc.h
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Mon, 6 Aug 2012 00:51:11 +0000 (02:51 +0200)]
mpc8: fix pts
Fixes Ticket1254
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 5 Aug 2012 23:27:52 +0000 (01:27 +0200)]
mov: dont clip timestamps at 0
Fixes Ticket1251
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sun, 5 Aug 2012 23:33:36 +0000 (23:33 +0000)]
configure: make libtwolame check more robust
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Piotr Bandurski [Sun, 5 Aug 2012 22:37:28 +0000 (00:37 +0200)]
movenv: fix remuxing of qdm2
Piotr Bandurski [Sun, 5 Aug 2012 22:08:53 +0000 (00:08 +0200)]
aiffenc: fix remuxing of qdm2
Clément Bœsch [Sun, 5 Aug 2012 21:25:27 +0000 (23:25 +0200)]
Replace various inlined inverse AVRational with av_inv_q().
Clément Bœsch [Sun, 5 Aug 2012 19:08:42 +0000 (21:08 +0200)]
lavfi/overlay: remove dead initialization.
Piotr Bandurski [Sun, 5 Aug 2012 21:58:10 +0000 (23:58 +0200)]
movenc: fix remuxing of svq3
Martin Storsjö [Sun, 5 Aug 2012 19:55:21 +0000 (22:55 +0300)]
lavf: Declare an AVRational struct without a struct literal
At this place, the normal way of initializing a struct works
fine, there's no need for a struct literal.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Sun, 5 Aug 2012 20:17:02 +0000 (22:17 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: h264_idct: Rename x264_add8x4_idct_sse2 --> h264_add8x4_idct_sse2
rational: add av_inv_q() returning the inverse of an AVRational
dpx: Make start offset unsigned
lavfi: properly signal out-of-memory error in ff_filter_samples
cosmetics: Fix a few switched periods and linebreaks
zerocodec: Fix memleak in decode_frame
zerocodec: Cosmetics
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Tue, 31 Jul 2012 22:17:43 +0000 (00:17 +0200)]
x86: h264_idct: Rename x264_add8x4_idct_sse2 --> h264_add8x4_idct_sse2
Reimar Döffinger [Sun, 5 Aug 2012 07:45:04 +0000 (09:45 +0200)]
oggdec: Initialize stream index to -1 in ogg_packet.
The previous method of having to initialize it outside lead
to incorrect code: even if it was initialized, it usually was
only initialized once, thus a packet that could not be matched
to any stream would just be processed with the return values
from the previous call.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Sun, 5 Aug 2012 07:41:20 +0000 (09:41 +0200)]
oggdec: simplify start time calculation code.
Also slightly more correct behaviour in case streams_left for
some reason is 0 from the start.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Paul B Mahol [Wed, 1 Aug 2012 14:33:34 +0000 (14:33 +0000)]
libtwolame MP2 encoding support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Mans Rullgard [Sun, 29 Jul 2012 13:58:53 +0000 (14:58 +0100)]
rational: add av_inv_q() returning the inverse of an AVRational
This allows simplifying a few expressions.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Derek Buitenhuis [Sat, 4 Aug 2012 23:41:20 +0000 (19:41 -0400)]
dpx: Make start offset unsigned
Some corrupted files would end up with a negative offset,
and segfault.
Fixes bug #177.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Moritz Bunkus [Sun, 5 Aug 2012 16:34:28 +0000 (18:34 +0200)]
matroskaenc: Implement support for ALAC
Philip Langdale [Sun, 5 Aug 2012 15:57:20 +0000 (08:57 -0700)]
ass subtitles: Fix valgrind warnings.
We're now running some of this code through valgrind for the first
time, and a few warnings showed up stemming from two problems.
1) The ASS code assumes the subtitle header is null terminated, but
it wasn't, and passing the size down doesn't look like fun, so I
added a terminator
2) The code wasn't freeing all of its state.
Signed-off-by: Philip Langdale <philipl@overt.org>
Michael Niedermayer [Sun, 5 Aug 2012 15:04:59 +0000 (17:04 +0200)]
matroskadec: prevent potential integer overflow
Iam not sure this can happen, but its safer we check.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Moritz Bunkus [Sun, 5 Aug 2012 14:25:48 +0000 (16:25 +0200)]
matroskadec: Implement support for ALAC
This patch implements support reading ALAC from Matroska files. The
only non-trivial thing about it is that only the ALAC magic cookie is
stored in Matroska's CodecPrivate element but not the "atom size",
"tag" and "tag version" fields that FFMPEG's ALAC decoder
expects. However, those are trivial to re-create.
Sample files are available:
http://www.bunkus.org/videotools/mkvtoolnix/samples/alac/alac-in-matroska.mka
and the CoreAudio file it was created from with today's mkvmerge:
http://www.bunkus.org/videotools/mkvtoolnix/samples/alac/alac-in-matroska-source.caf
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 5 Aug 2012 15:58:08 +0000 (17:58 +0200)]
fate: add bitexact flag to fate-sub-movtextenc
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 5 Aug 2012 15:55:26 +0000 (17:55 +0200)]
libavcodec/options_table: mark flags as also for subtitles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sun, 5 Aug 2012 15:49:14 +0000 (17:49 +0200)]
doc/filters: fix typo in "@end table."
Remove erroneously added trailing dot.
Philip Langdale [Sun, 5 Aug 2012 15:26:49 +0000 (08:26 -0700)]
movenc: Fix unfreed memory found by valgrind.
Signed-off-by: Philip Langdale <philipl@overt.org>
Stefano Sabatini [Sun, 5 Aug 2012 09:22:54 +0000 (11:22 +0200)]
doc/filters: add mandelbrot source documentation
Address trac ticket #1492.
Stefano Sabatini [Sun, 5 Aug 2012 08:04:02 +0000 (10:04 +0200)]
lavf/img2dec: add start_number_range option
Stefano Sabatini [Fri, 3 Aug 2012 15:56:14 +0000 (17:56 +0200)]
examples/muxing: drop duplicated code in add_video_stream()
Reinhard Tartler [Sat, 4 Aug 2012 13:24:15 +0000 (15:24 +0200)]
lavfi: properly signal out-of-memory error in ff_filter_samples
Found with a clang-scan report on http://fate.libav.org/csa/
Hendrik Leppkes [Sun, 5 Aug 2012 08:23:50 +0000 (10:23 +0200)]
configure: fix lib.exe check
Running lib.exe without parameters will always result in an error,
and failing the check.
Using the -list paramter results in a success if lib.exe is present.
Michael Niedermayer [Sun, 5 Aug 2012 02:41:34 +0000 (04:41 +0200)]
oggdec: check stream index before using it in ogg_get_length()
Fixes crash based on a uninitialized array index read.
If the read does not crash then out of array writes based
on the same index might have been triggered afterwards.
Found-by: inferno@chromium.org
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sat, 4 Aug 2012 16:25:34 +0000 (18:25 +0200)]
doc/demuxers.texi: avoid comma splice in image2 documentation
Add "and" proposition for connecting two sentences.
Stefano Sabatini [Sat, 4 Aug 2012 11:04:40 +0000 (13:04 +0200)]
lavf/img2doc: document options
Stefano Sabatini [Sat, 4 Aug 2012 15:34:53 +0000 (17:34 +0200)]
lavf/img2dec: improve error logging in case of find_image_range() failure
Stefano Sabatini [Sat, 4 Aug 2012 10:45:09 +0000 (12:45 +0200)]
lavf/img2dec: sort options by name
Stefano Sabatini [Sat, 4 Aug 2012 15:15:23 +0000 (17:15 +0200)]
lavf/img2dec: introduce and use FIRST_INDEX_SEARCH_RANGE macro in find_image_range
Stefano Sabatini [Sat, 4 Aug 2012 15:07:26 +0000 (17:07 +0200)]
lavf/img2dec: fix out-of-range check in find_image_range()
Take the new parameter start_index into account.
Stefano Sabatini [Sat, 4 Aug 2012 15:06:05 +0000 (17:06 +0200)]
lavf/img2dec: doxygen find_image_range() function
Stefano Sabatini [Sat, 4 Aug 2012 15:04:04 +0000 (17:04 +0200)]
lavf/img2dec: rename find_image_range() "max_start" parameter to "start_index"
The new name seems more consistent with the assumed logic.
"start_index" represents the minimum accepted value as first index, and
not the maximum value as implicitely assumed by the previous name.
Stefano Sabatini [Sat, 4 Aug 2012 14:54:18 +0000 (16:54 +0200)]
lavf/img2dec: fix weird start_number count logic
This seems consistent with the assumed meaning of the option.
Stefano Sabatini [Fri, 3 Aug 2012 15:51:00 +0000 (17:51 +0200)]
examples/muxing: simplify alloc_picture()
Use avpicture_alloc() high level function.
Michael Niedermayer [Sat, 4 Aug 2012 20:39:25 +0000 (22:39 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavr: fix handling of custom mix matrices
fate: force pix_fmt in lagarith-rgb32 test
fate: add tests for lagarith lossless video codec.
ARMv6: vp8: fix stack allocation with Apple's assembler
ARM: vp56: allow inline asm to build with clang
fft: 3dnow: fix register name typo in DECL_IMDCT macro
x86: dct32: port to cpuflags
x86: build: replace mmx2 by mmxext
Revert "wmapro: prevent division by zero when sample rate is unspecified"
wmapro: prevent division by zero when sample rate is unspecified
lagarith: fix color plane inversion for YUY2 output.
lagarith: pad RGB buffer by 1 byte.
dsputil: make add_hfyu_left_prediction_sse4() support unaligned src.
Conflicts:
doc/APIchanges
libavcodec/lagarith.c
libavfilter/x86/gradfun.c
libavutil/cpu.h
libavutil/version.h
libswscale/utils.c
libswscale/version.h
libswscale/x86/yuv2rgb.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Derek Buitenhuis [Sat, 4 Aug 2012 19:40:35 +0000 (15:40 -0400)]
cosmetics: Fix a few switched periods and linebreaks
Based on a patch by Piotr Bandurski.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Nicolas George [Thu, 26 Jul 2012 17:29:27 +0000 (19:29 +0200)]
ffmpeg: insert bitmap subtitles as video in filters.
With this feature, it becomes possible to perform commonly
requested tasks, such as hardcoding bitmap subtitles.
This will be reverted once libavfilter has proper support
for subtitles. All the changes have the string "sub2video"
in them, it makes it easy to spot the parts.
Nicolas George [Sun, 29 Jul 2012 16:58:42 +0000 (18:58 +0200)]
lavfi: document the constraints on incoming frames.
Nicolas George [Sun, 29 Jul 2012 16:43:45 +0000 (18:43 +0200)]
lavfi: use a new field for automatic buffer copy.
The code currently use cur_buf as the target of the copy,
but cur_buf can be cleared by the filter if it has given
the reference away or stored it elsewhere as soon as start_frame.
The code still relies on the fact that the reference is not
destroyed until end_frame. All filters currently follow that condition.
An av_assert1() is added to check it; it should at least cause
very visible errors in valgrind.
Michael Niedermayer [Sat, 4 Aug 2012 19:21:41 +0000 (21:21 +0200)]
Merge remote-tracking branch 'dwbuiten/master'
* dwbuiten/master:
zerocodec: Fix memleak in decode_frame
zerocodec: Cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Philip Langdale [Sat, 4 Aug 2012 19:19:46 +0000 (12:19 -0700)]
movtextenc: Remove dangling reference to movtext.h
This is a reference that leaked in from my future work to
support styling.
Signed-off-by: Philip Langdale <philipl@overt.org>
Derek Buitenhuis [Sat, 4 Aug 2012 02:13:43 +0000 (22:13 -0400)]
zerocodec: Fix memleak in decode_frame
If there was a failure inflating, or reinitializing
the zstream, the current frame's buffer would be lost.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>