OSDN Git Service
Michael Niedermayer [Wed, 28 Mar 2012 02:12:24 +0000 (04:12 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
westwood_vqa: fix SND0 chunk handling
westwood_vqa: set video stream duration
raw: forward avpicture_fill() error code in raw_decode().
build: Do not explicitly add the doc directory to the OBJDIRS list.
dv: Split off DV video decoder into its own file.
build: fix RALF decoder standalone compilation, which depends on Golomb code
configure: Drop stray duplicate entry for --disable-fft from help output.
Conflicts:
libavcodec/dv.c
libavcodec/rawdec.c
libavformat/westwood_vqa.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 28 Mar 2012 01:17:48 +0000 (03:17 +0200)]
h263dec: Restore w/h values to a consistent state if a change is rejected.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Piotr Bandurski [Tue, 27 Mar 2012 22:13:32 +0000 (00:13 +0200)]
id3v2: support JPEG APIC with incorrect (image/jpg) MIME type
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Tue, 27 Mar 2012 18:53:05 +0000 (18:53 +0000)]
Support FLIC in AVI.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 28 Mar 2012 00:16:48 +0000 (02:16 +0200)]
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: pause rdft column when ffplay is paused
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 27 Mar 2012 02:11:14 +0000 (04:11 +0200)]
ffplay: pause rdft column when ffplay is paused
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
Paul B Mahol [Fri, 23 Mar 2012 22:54:09 +0000 (22:54 +0000)]
XBM decoder
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Tue, 27 Mar 2012 14:06:53 +0000 (14:06 +0000)]
j2kdec: move ff_j2k_init_tier1_luts() to j2kdec_init()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Tim Nicholson [Mon, 26 Mar 2012 16:39:05 +0000 (17:39 +0100)]
Clarify the use of the interl=1|-1 option of the scale filter.
It is not entirely clear that whilst for width and height only an
expression needs to be provided, for interlace the option must
also be given.
It is also unclear that the default is non interlaced aware scaling.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Thilo Borgmann [Tue, 27 Mar 2012 16:06:54 +0000 (18:06 +0200)]
alsdec: check return values.
Paul B Mahol [Tue, 20 Mar 2012 22:27:09 +0000 (22:27 +0000)]
westwood_vqa: fix SND0 chunk handling
Version from vqa header does not dictate which sound chunks may
appear in file.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Paul B Mahol [Tue, 20 Mar 2012 22:26:41 +0000 (22:26 +0000)]
westwood_vqa: set video stream duration
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Ronald S. Bultje [Tue, 27 Mar 2012 01:02:08 +0000 (18:02 -0700)]
raw: forward avpicture_fill() error code in raw_decode().
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Michael Niedermayer [Tue, 27 Mar 2012 13:16:37 +0000 (15:16 +0200)]
h264: dont mess with chroma planes for grayscale h264.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 27 Mar 2012 11:49:58 +0000 (13:49 +0200)]
alsdec: make sure no invalid opt_order stays in the context.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 27 Mar 2012 11:21:56 +0000 (13:21 +0200)]
vc1dec: dont ignore ff_vc1_parse_frame_header_advs return value
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 27 Mar 2012 11:21:28 +0000 (13:21 +0200)]
vc1dec: avoid == -1 checks for errors.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 27 Mar 2012 11:20:51 +0000 (13:20 +0200)]
vc1dec: sanity check state used in get_mvdata_interlaced()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 27 Mar 2012 10:52:53 +0000 (12:52 +0200)]
oma: dont over-read buffer
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 27 Mar 2012 09:52:08 +0000 (11:52 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
make av_interleaved_write_frame() flush packets when pkt is NULL
mpegts: Fix dead error checks
vc1: Do not read from array if index is invalid.
targa: convert to bytestream2.
rv34: set mb_num_left to 0 after finishing a frame
Conflicts:
libavcodec/targa.c
libavcodec/vc1data.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Mon, 26 Mar 2012 13:10:12 +0000 (15:10 +0200)]
build: Do not explicitly add the doc directory to the OBJDIRS list.
Now that a documentation generator is built in the doc directory,
this is no longer necessary. Fixes the Make warning:
Makefile:188: target `doc' given more than once in the same rule.
Diego Biurrun [Sun, 18 Mar 2012 18:01:45 +0000 (19:01 +0100)]
dv: Split off DV video decoder into its own file.
Diego Biurrun [Mon, 26 Mar 2012 23:04:45 +0000 (01:04 +0200)]
build: fix RALF decoder standalone compilation, which depends on Golomb code
Diego Biurrun [Mon, 26 Mar 2012 11:36:06 +0000 (13:36 +0200)]
configure: Drop stray duplicate entry for --disable-fft from help output.
Jindrich Makovicka [Wed, 21 Mar 2012 10:42:32 +0000 (11:42 +0100)]
make av_interleaved_write_frame() flush packets when pkt is NULL
This patch allows the user to force flushing of all queued packets
by calling av_interleaved_write_frame() with pkt set to NULL.
Signed-off-by: Jindrich Makovicka <jindrich.makovicka@nangu.tv>
Signed-off-by: Martin Storsjö <martin@martin.st>
Compn [Tue, 27 Mar 2012 02:18:48 +0000 (22:18 -0400)]
doc: clarify dshow input requirements
Paul B Mahol [Tue, 27 Mar 2012 01:15:20 +0000 (01:15 +0000)]
j2kdec: remove pointless swapping
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Mon, 26 Mar 2012 23:32:30 +0000 (23:32 +0000)]
j2kdec: vertically align AVCodec members
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Mon, 26 Mar 2012 23:32:30 +0000 (23:32 +0000)]
j2kdec: Remove useless .pix_fmts.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Mon, 26 Mar 2012 23:32:29 +0000 (23:32 +0000)]
j2kdec: convert to bytestream2 API
Protects against overreads.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Alex Converse [Mon, 26 Mar 2012 22:51:59 +0000 (15:51 -0700)]
mpegts: Fix dead error checks
Mashiat Sarker Shakkhar [Sat, 24 Mar 2012 22:49:34 +0000 (15:49 -0700)]
vc1: Do not read from array if index is invalid.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Ronald S. Bultje [Tue, 27 Mar 2012 00:46:16 +0000 (17:46 -0700)]
targa: convert to bytestream2.
Also remove some write-only variables or write-only variable
assignments, remove internal colorspace conversion to native
endianness (that can be done by swscale much more efficiently),
and some cosmetics.
Michael Niedermayer [Tue, 27 Mar 2012 00:43:40 +0000 (02:43 +0200)]
ffmpeg: fix handling or empty audio packets
Fixes Ticket1131
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 27 Mar 2012 00:30:08 +0000 (02:30 +0200)]
ffmpeg: more verbose error messages in case of audio encoding failure.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 27 Mar 2012 00:11:03 +0000 (02:11 +0200)]
Revert "raw: move buffer size check up."
This reverts commit
cc5dd632cecc5114717d0b90f8c2be162b1c6ee8.
The change was redundant, it has been fixed long ago (
422e3a7)
Conflicts:
libavcodec/rawdec.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Mon, 26 Mar 2012 22:20:02 +0000 (00:20 +0200)]
rv34: set mb_num_left to 0 after finishing a frame
Prevents running error resilience on a previous frame which will write
to the pic->mb_type[] array of the previous image. The array might
already be re-used for a new image in a subsequent thread, thus cause
two threads to write to the same pic->mb_type[] array, causing a race
condition which can crash in rv34_decode_cbp(), called by
rv34_decode_inter_mb_header() (which accesses mb_type[] twice,
assuming values are maintained, which the race condition breaks).
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Paul B Mahol [Mon, 26 Mar 2012 20:19:01 +0000 (20:19 +0000)]
j2kenc: cosmetics: vertically align AVCodec members.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sun, 25 Mar 2012 23:31:31 +0000 (23:31 +0000)]
libopenjpegdec: hack to fix GRAY16 decoding
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 26 Mar 2012 22:44:32 +0000 (00:44 +0200)]
vc1dec: move mquant zero check down.
This way it catches all cases, and prevents later segfaults.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 26 Mar 2012 22:12:03 +0000 (00:12 +0200)]
targa: Fix input buffer size check.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Mon, 26 Mar 2012 20:46:03 +0000 (22:46 +0200)]
RELEASE: bump to current version (0.10.2).
Clément Bœsch [Mon, 26 Mar 2012 20:43:10 +0000 (22:43 +0200)]
APIchanges: fill in missing dates and hashes.
Clément Bœsch [Mon, 26 Mar 2012 20:32:17 +0000 (22:32 +0200)]
aac: reference supported sample rates in encoders.
Clément Bœsch [Tue, 20 Mar 2012 15:19:49 +0000 (16:19 +0100)]
ffmpeg: more expressive sample rate automatic selection.
Output now lists the available sample rates with commands like
ffmpeg -f lavfi -i aevalsrc=0 -ar 20000 -y /tmp/out.mp3
Clément Bœsch [Tue, 14 Feb 2012 16:00:53 +0000 (17:00 +0100)]
lavfi: add avfilter_fill_frame_from_{audio_,}buffer_ref().
Michael Niedermayer [Mon, 26 Mar 2012 20:11:53 +0000 (22:11 +0200)]
indeo3dec: check mv bitstream pointer
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 26 Mar 2012 20:06:54 +0000 (22:06 +0200)]
indeo3dec: Fix end pointer.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 26 Mar 2012 18:34:29 +0000 (20:34 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: ppc: drop stray leftover backslash
build: Only clean the architecture subdirectory we build for.
build: drop some unnecessary dependencies from the H.264 parser
build: prettyprinting cosmetics
libavutil: Remove pointless rational test program.
libavutil: Remove broken and pointless lzo test program.
lavf doxy: expand AVStream.codec doxy.
lavf doxy: improve AVStream.time_base doxy.
lavf doxy: add some basic documentation about reading from the demuxer.
lavf doxy: document passing options to demuxers.
lavf doxy: clarify that an AVPacket contains encoded data.
mpegtsenc: allow user triggered PES packet flushing
APIchanges: mark the place where 0.7 was cut.
APIchanges: mark the place where 0.8 was cut.
APIchanges: fill in missing dates and hashes.
smacker: convert palette and header reading to bytestream2.
alac: convert extradata reading to bytestream2.
Conflicts:
doc/APIchanges
libavcodec/smacker.c
libavcodec/x86/Makefile
libavfilter/Makefile
libavutil/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Sun, 25 Mar 2012 11:25:42 +0000 (13:25 +0200)]
Enable generic index/seeking for mgsts demuxer.
This depends on the proposed parser change for 0-size packets
in previous mail, otherwise video now plays far too fast.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Sun, 25 Mar 2012 11:16:48 +0000 (13:16 +0200)]
Handle 0-size sync packets when only parsing headers.
Currently, the duration of those packets is just discarded
when enabling parsing, thus the output of the Metal Gear Solid
demuxer breaks completely when just setting AVSTREAM_PARSE_HEADERS.
The result will not be correct if a parser creates a delay even
with PARSER_FLAG_COMPLETE_FRAMES and there might be other cases
where it does not work correct, but just discarding them as it
is done currently seems worse.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Sat, 24 Mar 2012 19:28:43 +0000 (20:28 +0100)]
Support FLIC in MOV.
Fixes trac issue #626.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Diego Biurrun [Mon, 26 Mar 2012 14:15:52 +0000 (16:15 +0200)]
build: ppc: drop stray leftover backslash
Thilo Borgmann [Mon, 26 Mar 2012 13:24:45 +0000 (15:24 +0200)]
als: consistent messages
"." for warnings, "!" for errors.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Mon, 26 Mar 2012 13:01:56 +0000 (13:01 +0000)]
libopenjpegenc: remove leftover because older version of patch being applied
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Thilo Borgmann [Mon, 26 Mar 2012 13:25:27 +0000 (15:25 +0200)]
ALS error message pretty print
One prettier message.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 26 Mar 2012 13:29:14 +0000 (15:29 +0200)]
qdm2: Fix out of array writes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 26 Mar 2012 13:26:14 +0000 (15:26 +0200)]
qdm2: fix out of array read
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 26 Mar 2012 13:16:47 +0000 (15:16 +0200)]
qdm2dec: fix out of array read
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 26 Mar 2012 13:05:02 +0000 (15:05 +0200)]
mxfdec: fix off by one error.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Mon, 6 Feb 2012 18:31:18 +0000 (19:31 +0100)]
build: Only clean the architecture subdirectory we build for.
This allows simplifying the Makefiles; it is no longer necessary to register
arch subdirectory Makefiles, just putting them in place is enough.
Diego Biurrun [Sun, 25 Mar 2012 10:19:55 +0000 (12:19 +0200)]
build: drop some unnecessary dependencies from the H.264 parser
Diego Biurrun [Thu, 2 Feb 2012 22:55:57 +0000 (23:55 +0100)]
build: prettyprinting cosmetics
Diego Biurrun [Thu, 26 Jan 2012 17:45:11 +0000 (18:45 +0100)]
libavutil: Remove pointless rational test program.
Diego Biurrun [Thu, 26 Jan 2012 01:38:30 +0000 (02:38 +0100)]
libavutil: Remove broken and pointless lzo test program.
Anton Khirnov [Thu, 15 Mar 2012 10:27:47 +0000 (11:27 +0100)]
lavf doxy: expand AVStream.codec doxy.
Anton Khirnov [Mon, 27 Feb 2012 08:41:31 +0000 (09:41 +0100)]
lavf doxy: improve AVStream.time_base doxy.
Remove confusing sentence that implied the user should set the timebase.
Elaborate on how the timebase is set for muxing.
Anton Khirnov [Mon, 27 Feb 2012 08:35:17 +0000 (09:35 +0100)]
lavf doxy: add some basic documentation about reading from the demuxer.
Anton Khirnov [Tue, 3 Jan 2012 07:34:55 +0000 (08:34 +0100)]
lavf doxy: document passing options to demuxers.
Anton Khirnov [Tue, 3 Jan 2012 06:41:14 +0000 (07:41 +0100)]
lavf doxy: clarify that an AVPacket contains encoded data.
Jindrich Makovicka [Wed, 21 Mar 2012 11:35:15 +0000 (12:35 +0100)]
mpegtsenc: allow user triggered PES packet flushing
Signed-off-by: Jindrich Makovicka <jindrich.makovicka@nangu.tv>
Signed-off-by: Martin Storsjö <martin@martin.st>
Anton Khirnov [Tue, 20 Mar 2012 06:58:00 +0000 (07:58 +0100)]
APIchanges: mark the place where 0.7 was cut.
Anton Khirnov [Tue, 20 Mar 2012 06:58:00 +0000 (07:58 +0100)]
APIchanges: mark the place where 0.8 was cut.
Anton Khirnov [Tue, 20 Mar 2012 06:45:45 +0000 (07:45 +0100)]
APIchanges: fill in missing dates and hashes.
Paul B Mahol [Mon, 26 Mar 2012 02:22:34 +0000 (02:22 +0000)]
libopenjpegdec: refactor some code and fix memory leaks
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Mon, 26 Mar 2012 02:01:23 +0000 (02:01 +0000)]
libopenjpegdec: always check image because decoding may still fail
Fixes bunch of segfaults.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sun, 25 Mar 2012 23:33:53 +0000 (23:33 +0000)]
libopenjpegenc: allow changing encoding parameters
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sun, 25 Mar 2012 23:33:52 +0000 (23:33 +0000)]
libopenjpegenc: merge common code
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sun, 25 Mar 2012 23:33:51 +0000 (23:33 +0000)]
libopenjpegenc: use pix_fmt descriptor to get bpp
This will also simplify adding support for RGB565 and similar.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sun, 25 Mar 2012 23:33:50 +0000 (23:33 +0000)]
libopenjpegenc: use pix_fmt descriptor to get numcomps
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 26 Mar 2012 01:46:06 +0000 (03:46 +0200)]
indeo4: better mv check
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 26 Mar 2012 00:24:36 +0000 (02:24 +0200)]
indeo5: check motion vectors.
fixes out of frame reading
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 26 Mar 2012 01:03:02 +0000 (03:03 +0200)]
mxfdec: pass correct context to av_timecode_init()
fixes null ptr dereference
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Sun, 25 Mar 2012 00:37:43 +0000 (17:37 -0700)]
smacker: convert palette and header reading to bytestream2.
Paul B Mahol [Sun, 25 Mar 2012 21:18:19 +0000 (21:18 +0000)]
vf_hflip: accept PIX_FMT_RGB444 and PIX_FMT_BGR444 pixel formats
Signed-off-by: Paul B Mahol <onemda@gmail.com>
added fate checksum update
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sun, 25 Mar 2012 10:55:49 +0000 (10:55 +0000)]
png: fix warning about discarding qualifiers [-Wincompatible-pointer-types]
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Aaron Colwell [Thu, 22 Mar 2012 19:37:47 +0000 (12:37 -0700)]
pthread : Remove lock/unlock pairs in worker loop to avoid unexpected state changes.
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 25 Mar 2012 21:10:30 +0000 (23:10 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: dsputil: prettyprint gcc inline asm
x86: K&R prettyprinting cosmetics for dsputil_mmx.c
x86: conditionally compile H.264 QPEL optimizations
dsputil_mmx: Surround QPEL macros by "do { } while (0);" blocks.
Ignore generated files below doc/.
dpcm: convert to bytestream2.
interplayvideo: convert to bytestream2.
movenc: Merge if statements
h264: fix memleak in error path.
pthread: Immediately release all frames in ff_thread_flush()
h264: Add check for invalid chroma_format_idc
utvideo: port header reading to bytestream2.
Conflicts:
.gitignore
configure
libavcodec/h264_ps.c
libavcodec/interplayvideo.c
libavcodec/pthread.c
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Sun, 25 Mar 2012 02:10:40 +0000 (19:10 -0700)]
alac: convert extradata reading to bytestream2.
Michael Niedermayer [Sun, 25 Mar 2012 19:50:49 +0000 (21:50 +0200)]
swr-test: test the new flexible buffering
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 25 Mar 2012 19:50:00 +0000 (21:50 +0200)]
swr: realloc_audio: support packed audio buffers
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 25 Mar 2012 19:04:48 +0000 (21:04 +0200)]
swr: More flexible and convenient buffering
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Julien Ramseier [Sun, 25 Mar 2012 14:38:57 +0000 (16:38 +0200)]
Fix SVCD scan_offset option
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Wed, 21 Mar 2012 22:18:54 +0000 (22:18 +0000)]
"Metal Gear Solid: The Twin Snakes" demuxer
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Philip Langdale [Sat, 24 Mar 2012 21:14:51 +0000 (14:14 -0700)]
CrystalHD: Remove EXPERIMENTAL flag for known good formats.
With the flag in place, it's hard to actually use the decoder, and
I'm happy with how it works, with the exception of DivX3 where I've
never found a sample that worked that I was confident actually
matched what the hardware claimed to support.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Marton Balint [Sat, 24 Mar 2012 22:34:43 +0000 (23:34 +0100)]
pthread: return proper error code on pthread_create failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 25 Mar 2012 09:48:09 +0000 (11:48 +0200)]
swr: fix segfault when 0 out size is used.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 25 Mar 2012 08:59:22 +0000 (10:59 +0200)]
swr: revert stray hunk
Found-by:ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Fri, 23 Mar 2012 20:21:47 +0000 (21:21 +0100)]
VC1: Do not needlessly use signed types.
This might even have prevented the compiler from some optimizations,
since both signed and unsigned types are used for the dezigzag tables/
table pointers, and if a branches uses both the compiler needs to
create more complex code.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Sat, 24 Mar 2012 16:13:55 +0000 (17:13 +0100)]
DV: detect another case of broken DV files.
See trac issue #217.
Only the dsf field seems to be used to distinguish between PAL and NTSC.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>