ffmpeg.git
7 years agocopy pts and format props between lavfi buffer and frame.
Robert Nagy [Sat, 14 Apr 2012 10:09:46 +0000 (12:09 +0200)]
copy pts and format props between lavfi buffer and frame.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agooggdec: Safety check against stream counts being inconsistent in seek()
Michael Niedermayer [Tue, 17 Apr 2012 12:44:06 +0000 (14:44 +0200)]
oggdec: Safety check against stream counts being inconsistent in seek()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agooggdec: Recreate streams only in the 1 stream case.
Michael Niedermayer [Tue, 17 Apr 2012 12:03:26 +0000 (14:03 +0200)]
oggdec: Recreate streams only in the 1 stream case.

Other cases are not supported and lead to inconsistencies which
can lead to out of array writes.

Reported-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 17 Apr 2012 10:13:22 +0000 (12:13 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  indeo3: add parens around some macro arguments
  h264: use proper PROLOGUE statement for a function using 8 registers.
  doc: Update sample Vim config with suitable (function) indentation settings.
  dv: Merge dvquant.h into dvdata.c where all other DV tables reside.
  dv: Move static tables only used in one place to where they are used.
  graphparser: set next to NULL on an entry extracted from inputs list
  doc/filters: update documentation.
  avconv: flush decoders immediately after an EOF.
  avconv: send EOF to vsrc_buffer.
  avconv: reindent.

Conflicts:
doc/filters.texi
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: libavutil tests do not require SAMPLES.
Nicolas George [Mon, 16 Apr 2012 11:19:07 +0000 (13:19 +0200)]
fate: libavutil tests do not require SAMPLES.

7 years agoparseutils: include errors in test output.
Nicolas George [Mon, 16 Apr 2012 10:07:48 +0000 (12:07 +0200)]
parseutils: include errors in test output.

7 years agoffmpeg: make max frames work again, after merge
Michael Niedermayer [Tue, 17 Apr 2012 01:54:49 +0000 (03:54 +0200)]
ffmpeg: make max frames work again, after merge

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovf_thumbnail: colorspace changed from yv12 to rgb
Michael Niedermayer [Tue, 17 Apr 2012 01:24:32 +0000 (03:24 +0200)]
vf_thumbnail: colorspace changed from yv12 to rgb

Not fully investigated but thumbnail supports rgb and not yv12 so
this is better ...

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: fix vp8 size change regression
Michael Niedermayer [Tue, 17 Apr 2012 01:20:37 +0000 (03:20 +0200)]
fate: fix vp8 size change regression

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovsrc_buffer: fix null ptr segfault
Michael Niedermayer [Tue, 17 Apr 2012 01:19:57 +0000 (03:19 +0200)]
vsrc_buffer: fix null ptr segfault

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfiltergraph: More advanced heuristic to select colorspace.
Michael Niedermayer [Tue, 17 Apr 2012 01:18:51 +0000 (03:18 +0200)]
avfiltergraph: More advanced heuristic to select colorspace.

This fixes regressions caused by switching from ffmpegs system to avfilters.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: gif: change checksum to bgr8 from rgb8 as thats what gets selected now
Michael Niedermayer [Tue, 17 Apr 2012 01:21:08 +0000 (03:21 +0200)]
fate: gif: change checksum to bgr8 from rgb8 as thats what gets selected now

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoimgconvert: fix regression with fate-gif colorspaces.
Michael Niedermayer [Tue, 17 Apr 2012 01:17:19 +0000 (03:17 +0200)]
imgconvert: fix regression with fate-gif colorspaces.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: fix regression with jpeg pix fmts
Michael Niedermayer [Tue, 17 Apr 2012 01:16:40 +0000 (03:16 +0200)]
ffmpeg: fix regression with jpeg pix fmts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: fix regression with png
Michael Niedermayer [Tue, 17 Apr 2012 01:15:54 +0000 (03:15 +0200)]
ffmpeg: fix regression with png

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: choose_pix_fmt: pass target fmt in
Michael Niedermayer [Tue, 17 Apr 2012 01:15:19 +0000 (03:15 +0200)]
ffmpeg: choose_pix_fmt: pass target fmt in

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '3b266da3d35f3f7a61258b78384dfe920d875d29'
Michael Niedermayer [Tue, 17 Apr 2012 02:01:17 +0000 (04:01 +0200)]
Merge commit '3b266da3d35f3f7a61258b78384dfe920d875d29'

* commit '3b266da3d35f3f7a61258b78384dfe920d875d29':
  avconv: add support for complex filtergraphs.
  avconv: make filtergraphs global.
  avconv: move filtered_frame from InputStream to OutputStream.
  avconv: don't set output width/height directly from input value.
  avconv: move resample_{width,height,pix_fmt} to InputStream.
  avconv: remove a useless variable from OutputStream.
  avconv: get output pixel format from lavfi.
  graphparser: fix the order in which unlabeled input links are returned.
  avconv: change {input,output}_{streams,files} into arrays of pointers.
  avconv: don't pass input/output streams to some functions.

Conflicts:
cmdutils.c
cmdutils.h
doc/ffmpeg.texi
ffmpeg.c
ffplay.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomatroskadec: use av_grow_packet in merge_packets.
Nicolas George [Mon, 16 Apr 2012 16:02:02 +0000 (18:02 +0200)]
matroskadec: use av_grow_packet in merge_packets.

It ensures that the packet is properly padded
and makes the code simpler.

Fixes trac ticket #1223.

7 years agomem.c: fix wrong comment.
Reimar Döffinger [Sun, 15 Apr 2012 20:35:19 +0000 (22:35 +0200)]
mem.c: fix wrong comment.

Overwriting the av_malloc etc. functions is not easily
possible anymore, even for systems that support overriding
symbols in shared libraries in principle.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agoRespect -copyinkf for subtitles.
Reimar Döffinger [Sun, 15 Apr 2012 19:43:55 +0000 (21:43 +0200)]
Respect -copyinkf for subtitles.

Necessary to make it possible to copy teletext streams
(trac issue #531).

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agoAdd skip_to_keyframe stream variable.
Reimar Döffinger [Fri, 13 Apr 2012 22:17:30 +0000 (00:17 +0200)]
Add skip_to_keyframe stream variable.

This replaces the matroskadec one with the same name.
The advantage is not only easier reuse in other demuxers
but also that we can make the decisions after the parser.
This fixes seeking in files that mark the keyframes incorrectly,
for example the file in track ticket #1003.
The matroska variable is still kept to be able to complain
about such broken files.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agosvq3: check the watermark height.
Michael Niedermayer [Mon, 16 Apr 2012 16:26:49 +0000 (18:26 +0200)]
svq3: check the watermark height.

Fixes division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodiracdec: check lowdelay bytes.
Michael Niedermayer [Mon, 16 Apr 2012 16:22:22 +0000 (18:22 +0200)]
diracdec: check lowdelay bytes.

Fixes division by zero

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoomadec: make sample rate table large enough to prevent out of array reading.
Michael Niedermayer [Mon, 16 Apr 2012 16:13:51 +0000 (18:13 +0200)]
omadec: make sample rate table large enough to prevent out of array reading.

The new values lead to error messages when used

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agog729dec: initialize pitch_delay_int_prev to the minimum valid value.
Michael Niedermayer [Mon, 16 Apr 2012 16:07:19 +0000 (18:07 +0200)]
g729dec: initialize pitch_delay_int_prev to the minimum valid value.

This prevents an out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoindeo3: add parens around some macro arguments
Mans Rullgard [Mon, 16 Apr 2012 14:48:05 +0000 (15:48 +0100)]
indeo3: add parens around some macro arguments

Without these, the expansion contains things like --1 with
some compilers resulting in build errors.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoh264: use proper PROLOGUE statement for a function using 8 registers.
Ronald S. Bultje [Sun, 15 Apr 2012 15:11:55 +0000 (08:11 -0700)]
h264: use proper PROLOGUE statement for a function using 8 registers.

Fixes crashes when using biweight on win64.

7 years agoloco: fix 10l typo (missing case)
Michael Niedermayer [Mon, 16 Apr 2012 14:46:53 +0000 (16:46 +0200)]
loco: fix 10l typo (missing case)

Found-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodsicinav: Check for overread in RLE decode.
Michael Niedermayer [Mon, 16 Apr 2012 14:44:12 +0000 (16:44 +0200)]
dsicinav: Check for overread in RLE decode.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosmacker: Check get_vlc() return values.
Michael Niedermayer [Mon, 16 Apr 2012 14:39:02 +0000 (16:39 +0200)]
smacker: Check get_vlc() return values.

Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodcadec: fix global array overread.
Michael Niedermayer [Mon, 16 Apr 2012 14:27:08 +0000 (16:27 +0200)]
dcadec: fix global array overread.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoSupport decoding LOCO_CRGBA.
Carl Eugen Hoyos [Mon, 16 Apr 2012 14:19:41 +0000 (16:19 +0200)]
Support decoding LOCO_CRGBA.

Fixes a part of ticket #1222.

7 years agoindeo4: avoid storing invalid values in quant_mat.
Michael Niedermayer [Mon, 16 Apr 2012 12:38:40 +0000 (14:38 +0200)]
indeo4: avoid storing invalid values in quant_mat.

Fixes a global array overread

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years ago4xmdemux: Check chunk size
Michael Niedermayer [Mon, 16 Apr 2012 12:30:33 +0000 (14:30 +0200)]
4xmdemux: Check chunk size

Fixes over reading the header array

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoomadec: check GEOB sizes against buffer size
Michael Niedermayer [Mon, 16 Apr 2012 11:51:40 +0000 (13:51 +0200)]
omadec: check GEOB sizes against buffer size

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovc1dec: add missing terminating element to mpeg4_video_profiles
Michael Niedermayer [Mon, 16 Apr 2012 11:40:55 +0000 (13:40 +0200)]
vc1dec: add missing terminating element to mpeg4_video_profiles

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovc1dec: check end_mb_y / start_mb_y validity
Michael Niedermayer [Mon, 16 Apr 2012 11:35:41 +0000 (13:35 +0200)]
vc1dec: check end_mb_y / start_mb_y validity

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoflvdec: allocate large enough buffer so get_bits() doesnt overread
Michael Niedermayer [Mon, 16 Apr 2012 10:01:55 +0000 (12:01 +0200)]
flvdec: allocate large enough buffer so get_bits() doesnt overread

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffv1: attempt to workaround intel CC fate issue.
Michael Niedermayer [Mon, 16 Apr 2012 09:51:17 +0000 (11:51 +0200)]
ffv1: attempt to workaround intel CC fate issue.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc: Update sample Vim config with suitable (function) indentation settings.
Diego Biurrun [Tue, 28 Feb 2012 19:44:41 +0000 (20:44 +0100)]
doc: Update sample Vim config with suitable (function) indentation settings.

7 years agodv: Merge dvquant.h into dvdata.c where all other DV tables reside.
Diego Biurrun [Wed, 4 Apr 2012 15:32:55 +0000 (17:32 +0200)]
dv: Merge dvquant.h into dvdata.c where all other DV tables reside.

7 years agodv: Move static tables only used in one place to where they are used.
Diego Biurrun [Wed, 4 Apr 2012 15:13:13 +0000 (17:13 +0200)]
dv: Move static tables only used in one place to where they are used.

7 years agographparser: set next to NULL on an entry extracted from inputs list
Anton Khirnov [Sun, 15 Apr 2012 19:08:37 +0000 (21:08 +0200)]
graphparser: set next to NULL on an entry extracted from inputs list

Prevents it from referring to the rest of the list.

7 years agoadxdec: Check available space before decoding block.
Michael Niedermayer [Sun, 15 Apr 2012 23:57:36 +0000 (01:57 +0200)]
adxdec: Check available space before decoding block.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosegafilm: make the loop condition in film_read_packet() match the contents.
Michael Niedermayer [Sun, 15 Apr 2012 23:24:04 +0000 (01:24 +0200)]
segafilm: make the loop condition in film_read_packet() match the contents.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/aresample: properly propagate pts == AV_NOPTS_VALUE;
Robert Nagy [Sun, 15 Apr 2012 23:08:00 +0000 (01:08 +0200)]
lavfi/aresample: properly propagate pts == AV_NOPTS_VALUE;

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
7 years agoyadif: fixed missing error handling for poll_frame.
Robert Nagy [Sun, 15 Apr 2012 13:46:37 +0000 (15:46 +0200)]
yadif: fixed missing error handling for poll_frame.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosws: remove cliping in yuv2rgb code.
Michael Niedermayer [Sun, 15 Apr 2012 21:38:42 +0000 (23:38 +0200)]
sws: remove cliping in yuv2rgb code.

This code should not be needed and it slows things down.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomov: reset dref_count on realloc to keep values consistent.
Michael Niedermayer [Sun, 15 Apr 2012 21:37:09 +0000 (23:37 +0200)]
mov: reset dref_count on realloc to keep values consistent.

This fixes a potential crash.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 15 Apr 2012 20:27:20 +0000 (22:27 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc: Improve suggested Emacs settings for our coding style.
  utvideo: Remove unused variable 'src_size'
  mov: free memory on header parsing failure
  mov: fix leaking memory with multiple drefs.
  swscale: clip before assigning tables in RGB output functions.
  swscale: fix off-by-one in second coefficient in bilinear filters.

Conflicts:
libavformat/mov.c
libswscale/output.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoindeo5: check for unsupported luma block type
Michael Niedermayer [Sun, 15 Apr 2012 19:01:35 +0000 (21:01 +0200)]
indeo5: check for unsupported luma block type

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/filters: update documentation.
Anton Khirnov [Tue, 3 Apr 2012 06:32:23 +0000 (08:32 +0200)]
doc/filters: update documentation.

7 years agoavconv: flush decoders immediately after an EOF.
Anton Khirnov [Mon, 2 Apr 2012 18:13:29 +0000 (20:13 +0200)]
avconv: flush decoders immediately after an EOF.

Prevents extensive buffering when overlaying a single picture.

7 years agoavconv: send EOF to vsrc_buffer.
Anton Khirnov [Sun, 1 Apr 2012 17:01:37 +0000 (19:01 +0200)]
avconv: send EOF to vsrc_buffer.

7 years agoavconv: reindent.
Anton Khirnov [Fri, 30 Mar 2012 20:07:56 +0000 (22:07 +0200)]
avconv: reindent.

7 years agoavconv: add support for complex filtergraphs.
Anton Khirnov [Sun, 1 Apr 2012 13:08:33 +0000 (15:08 +0200)]
avconv: add support for complex filtergraphs.

7 years agoavconv: make filtergraphs global.
Anton Khirnov [Thu, 29 Mar 2012 06:51:17 +0000 (08:51 +0200)]
avconv: make filtergraphs global.

This is the first step towards supporting complex filtergraphs with more
than one input and/or output.

7 years agoavconv: move filtered_frame from InputStream to OutputStream.
Anton Khirnov [Thu, 29 Mar 2012 07:00:09 +0000 (09:00 +0200)]
avconv: move filtered_frame from InputStream to OutputStream.

It more properly belongs to output, not input.

7 years agoavconv: don't set output width/height directly from input value.
Anton Khirnov [Thu, 29 Mar 2012 05:48:27 +0000 (07:48 +0200)]
avconv: don't set output width/height directly from input value.

Always take it from lavfi. This way we don't need a clearly defined
corresponding input stream.

7 years agoavconv: move resample_{width,height,pix_fmt} to InputStream.
Anton Khirnov [Thu, 29 Mar 2012 05:40:26 +0000 (07:40 +0200)]
avconv: move resample_{width,height,pix_fmt} to InputStream.

This is a more proper place for them, since they store parameters of the
input, not output, stream.

7 years agoavconv: remove a useless variable from OutputStream.
Anton Khirnov [Fri, 23 Mar 2012 19:59:09 +0000 (20:59 +0100)]
avconv: remove a useless variable from OutputStream.

7 years agoavconv: get output pixel format from lavfi.
Anton Khirnov [Fri, 23 Mar 2012 14:46:30 +0000 (15:46 +0100)]
avconv: get output pixel format from lavfi.

This way we don't require a clearly defined corresponding input stream.

The result for the xwd test changes because rgb24 is now chosen instead
of bgra.

7 years agotiffdec: check overread for packbits
Michael Niedermayer [Sun, 15 Apr 2012 18:19:42 +0000 (20:19 +0200)]
tiffdec: check overread for packbits

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoalsdec: fix number of decoded samples in first sub-block in BGMC mode.
Thilo Borgmann [Sun, 15 Apr 2012 16:07:12 +0000 (18:07 +0200)]
alsdec: fix number of decoded samples in first sub-block in BGMC mode.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agographparser: fix the order in which unlabeled input links are returned.
Anton Khirnov [Sun, 15 Apr 2012 12:52:00 +0000 (14:52 +0200)]
graphparser: fix the order in which unlabeled input links are returned.

7 years agoavconv: change {input,output}_{streams,files} into arrays of pointers.
Anton Khirnov [Sun, 15 Apr 2012 13:28:30 +0000 (15:28 +0200)]
avconv: change {input,output}_{streams,files} into arrays of pointers.

Right now, they are arrays of structs, reallocated when new
streams/files are added. This makes storing pointers to those structs
harder than necessary.

7 years agoavconv: don't pass input/output streams to some functions.
Anton Khirnov [Sun, 15 Apr 2012 13:03:07 +0000 (15:03 +0200)]
avconv: don't pass input/output streams to some functions.

They are globals, no point in pretending they are not.

7 years agolzw: check for overread
Michael Niedermayer [Sun, 15 Apr 2012 16:13:50 +0000 (18:13 +0200)]
lzw: check for overread

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agopngdec: check bits_per_pixel for palette mode.
Michael Niedermayer [Sun, 15 Apr 2012 16:01:11 +0000 (18:01 +0200)]
pngdec: check bits_per_pixel for palette mode.

This fixes a out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agopng: make sure the previous frames dimensions match before using it as reference
Michael Niedermayer [Sun, 15 Apr 2012 15:41:17 +0000 (17:41 +0200)]
png: make sure the previous frames dimensions match before using it as reference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoerror: ensure error codes are signed negative ints.
Nicolas George [Sun, 15 Apr 2012 09:15:28 +0000 (11:15 +0200)]
error: ensure error codes are signed negative ints.

Based on a patch by Robert Nagy <ronag89@gmail.com>.

It makes a difference when the error code is immediately cast
into a larger integer, such as an int64_t.

7 years agoff_lag_rac_init: fix signedness error leading to out of array read.
Michael Niedermayer [Sun, 15 Apr 2012 14:40:49 +0000 (16:40 +0200)]
ff_lag_rac_init: fix signedness error leading to out of array read.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoqdm2_fft_decode_tones: fix infinite loop
Michael Niedermayer [Sun, 15 Apr 2012 14:30:17 +0000 (16:30 +0200)]
qdm2_fft_decode_tones: fix infinite loop

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoqdm2: Check vlc_stage3_values index.
Michael Niedermayer [Sun, 15 Apr 2012 14:17:07 +0000 (16:17 +0200)]
qdm2: Check vlc_stage3_values index.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoSet bits_per_coded_sample when encoding Microsoft Video-1.
Carl Eugen Hoyos [Sun, 15 Apr 2012 14:35:03 +0000 (16:35 +0200)]
Set bits_per_coded_sample when encoding Microsoft Video-1.

Fixes ticket #1193.

7 years agoSupport decoding unaligned rgb24 lagarith.
Carl Eugen Hoyos [Sun, 15 Apr 2012 14:33:24 +0000 (16:33 +0200)]
Support decoding unaligned rgb24 lagarith.

Fixes ticket #1214.

7 years agodoc: Improve suggested Emacs settings for our coding style.
Diego Biurrun [Sat, 14 Apr 2012 17:24:16 +0000 (19:24 +0200)]
doc: Improve suggested Emacs settings for our coding style.

Switch from changing global values to defining a separate C style
and add appropriate settings for indenting assignments that span
more than one line.

7 years agoxan: check for vector_segment overread
Michael Niedermayer [Sun, 15 Apr 2012 13:36:38 +0000 (15:36 +0200)]
xan: check for vector_segment overread

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoeatgv: check vector_bits
Michael Niedermayer [Sun, 15 Apr 2012 13:29:50 +0000 (15:29 +0200)]
eatgv: check vector_bits

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotiny_psnr: reindent after last commit.
Nicolas George [Sun, 15 Apr 2012 13:46:46 +0000 (15:46 +0200)]
tiny_psnr: reindent after last commit.

7 years agotiny_psnr: support unseekable raw files.
Nicolas George [Sun, 15 Apr 2012 12:20:42 +0000 (14:20 +0200)]
tiny_psnr: support unseekable raw files.

If either one of the files if not seekable,
do not try to read headers.

It allows to use it with pipes on whole rawvideo data.

7 years agoff_ivi_decode_blocks: fix negative scan_pos case.
Michael Niedermayer [Sun, 15 Apr 2012 12:58:06 +0000 (14:58 +0200)]
ff_ivi_decode_blocks: fix negative scan_pos case.

Fixes out of global array read.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoindeo: Check allocated tile size in ff_ivi_process_empty_tile()
Michael Niedermayer [Sun, 15 Apr 2012 12:16:55 +0000 (14:16 +0200)]
indeo: Check allocated tile size in ff_ivi_process_empty_tile()

This prevents writing into a too small array if some parameters changed
without the tile being reallocated.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoindeo5: check tile size in decode_mb_info().
Michael Niedermayer [Sun, 15 Apr 2012 12:11:50 +0000 (14:11 +0200)]
indeo5: check tile size in decode_mb_info().

This prevents writing into a too small array if some parameters changed
without the tile being reallocated.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure: add dependencies for colormatrix test.
Nicolas George [Sun, 15 Apr 2012 11:10:26 +0000 (13:10 +0200)]
configure: add dependencies for colormatrix test.

7 years agoindeo5: set transform_size like indeo4 does to prevent useage of too large transforms.
Michael Niedermayer [Sun, 15 Apr 2012 11:33:18 +0000 (13:33 +0200)]
indeo5: set transform_size like indeo4 does to prevent useage of too large transforms.

I dont know if this is needed, its a precautionary change.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoindeo4: check transform size.
Michael Niedermayer [Sun, 15 Apr 2012 11:26:19 +0000 (13:26 +0200)]
indeo4: check transform size.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoutvideo: Remove unused variable 'src_size'
Derek Buitenhuis [Sat, 14 Apr 2012 21:26:58 +0000 (17:26 -0400)]
utvideo: Remove unused variable 'src_size'

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agoutvideo: Remove unused variable 'src_size'
Derek Buitenhuis [Sat, 14 Apr 2012 21:26:58 +0000 (17:26 -0400)]
utvideo: Remove unused variable 'src_size'

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agomov: free memory on header parsing failure
Dale Curtis [Sun, 15 Apr 2012 00:48:42 +0000 (17:48 -0700)]
mov: free memory on header parsing failure

Call mov_read_close when mov_read_header fails.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agomov: fix leaking memory with multiple drefs.
Dale Curtis [Fri, 13 Apr 2012 00:56:57 +0000 (17:56 -0700)]
mov: fix leaking memory with multiple drefs.

Instead of allocating over the original, free first. MOVStreamContext
is zero initialized so no double free will occur. Same style as other
fixes for the same problem in this file.

Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agoswscale: clip before assigning tables in RGB output functions.
Ronald S. Bultje [Fri, 13 Apr 2012 21:42:21 +0000 (14:42 -0700)]
swscale: clip before assigning tables in RGB output functions.

7 years agoswscale: fix off-by-one in second coefficient in bilinear filters.
Ronald S. Bultje [Fri, 13 Apr 2012 21:37:47 +0000 (14:37 -0700)]
swscale: fix off-by-one in second coefficient in bilinear filters.

If coefficient A is 12-bits xixed-point number "X", then the other
coefficient is (1 << 12) - X, not (1 << 12) - X - 1.

7 years agompegvideo_enc: fix dts
Michael Niedermayer [Sat, 14 Apr 2012 23:08:13 +0000 (01:08 +0200)]
mpegvideo_enc: fix dts

Fixes Ticket1200

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 14 Apr 2012 19:49:01 +0000 (21:49 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vsrc_buffer: fix check from 7ae7c41.
  libxvid: Reorder functions to avoid forward declarations; make functions static.
  libxvid: drop some pointless dead code
  wmal: vertical alignment cosmetics
  wmal: Warn about missing bitstream splicing feature and ask for sample.
  wmal: Skip seekable_frame_in_packet.
  wmal: Drop unused variable num_possible_block_size.
  avfiltergraph: make the AVFilterInOut alloc/free API public
  graphparser: allow specifying sws flags in the graph description.
  graphparser: fix the order of connecting unlabeled links.
  graphparser: add avfilter_graph_parse2().
  vsrc_buffer: allow using a NULL buffer to signal EOF.
  swscale: handle last pixel if lines have an odd width.
  qdm2: fix a dubious pointer cast
  WMAL: Do not try to read rawpcm coefficients if bits is invalid
  mov: Fix detecting there is no sync sample.
  tiffdec: K&R cosmetics
  avf: has_duration does not check the global one
  dsputil: fix optimized emu_edge function on Win64.

Conflicts:
doc/APIchanges
libavcodec/libxvid_rc.c
libavcodec/libxvidff.c
libavcodec/tiff.c
libavcodec/wmalosslessdec.c
libavfilter/avfiltergraph.h
libavfilter/graphparser.c
libavfilter/version.h
libavfilter/vsrc_buffer.c
libswscale/output.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoindeo4: setup width/height properly.
Michael Niedermayer [Sat, 14 Apr 2012 18:04:05 +0000 (20:04 +0200)]
indeo4: setup width/height properly.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomatroskadec: fix null pointer dereference
Michael Niedermayer [Sat, 14 Apr 2012 17:33:24 +0000 (19:33 +0200)]
matroskadec: fix null pointer dereference

Fixes: Ticket1206
Found-by: John Villamil
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovsrc_buffer: fix check from 7ae7c41.
Anton Khirnov [Sat, 14 Apr 2012 10:49:27 +0000 (12:49 +0200)]
vsrc_buffer: fix check from 7ae7c41.

The user submitted variable in this function is frame, not buf.

7 years agowtvdec: fix name_size check to consider integer overflows.
Michael Niedermayer [Sat, 14 Apr 2012 16:32:36 +0000 (18:32 +0200)]
wtvdec: fix name_size check to consider integer overflows.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolagarith: check count before writing zeros.
Michael Niedermayer [Sat, 14 Apr 2012 16:28:31 +0000 (18:28 +0200)]
lagarith: check count before writing zeros.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>