Michael Niedermayer
81471d8246
avcodec/jpeg2000dec: increase tile_parts to 6
...
Fixes Ticket4602
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-10 04:50:14 +02:00
Michael Niedermayer
213f2da46a
avcodec/jpeg2000dec: Fix shift for RGB(A)48/64
...
Found-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-10 04:19:38 +02:00
Michael Niedermayer
913685f552
avdevice/lavfi: do not rescale AV_NOPTS_VALUE in lavfi_read_packet()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-10 00:56:02 +02:00
Michael Niedermayer
58142a27ea
MAINTAINERS: add 2.7
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-09 23:55:19 +02:00
Andreas Cadhalpun
58995f647b
sonic: set avctx->channels in sonic_decode_init
...
Otherwise it can be 0 in sonic_decode_frame, causing SIGFPE crashes.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-06-09 23:21:51 +02:00
Michael Niedermayer
3a99f6e79f
Changelog: Add 2.7 entry
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-09 23:14:57 +02:00
Michael Niedermayer
a5f44bc446
doc/APIchanges: fill in missing stuff
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-09 23:08:53 +02:00
Michael Niedermayer
6ddb109b90
doc/APIchanges: Add 2.7 separator
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-09 23:05:07 +02:00
Simon Thelen
83307a32eb
libavutil/channel_layout: Correctly return layout when channel specification ends with a trailing 'c'.
...
Return layout when FF_API_GET_CHANNEL_LAYOUT_COMPAT is set even if the
layout itself is not in the deprecated style.
Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-09 22:44:34 +02:00
Vignesh Venkatasubramanian
34ae98a771
lavf/webm_chunk: Remove AVFMT_ALLOW_FLUSH
...
The flag was set unintentionally and the code will break if a NULL
packet is passed in.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-09 21:19:57 +02:00
Michael Niedermayer
0916938a8d
avcodec/jpeg2000dec: Fix gain regression with gray16
...
Found-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-09 20:26:38 +02:00
Michael Niedermayer
6bf8d9e164
fate: Force jpeg2000 decoder for dcinema
...
so that no external decoder is used which would break the test
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-09 20:09:12 +02:00
Michael Niedermayer
adbe1d7de4
avcodec/libopenjpegdec: Mark as experimental if <= 1.3
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-09 18:59:30 +02:00
Michael Niedermayer
dbbb31e5bb
avcodec/jpeg2000: remove unused variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-09 18:48:39 +02:00
Michael Niedermayer
32b1131fc1
avformat/oggenc: Fix return code in case of flushing
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-09 18:42:55 +02:00
Michael Niedermayer
dac7b27802
Merge commit 'b14086ca38efa1a86cb0f0c6aa147b05f698877b'
...
* commit 'b14086ca38efa1a86cb0f0c6aa147b05f698877b':
mkv: Correctly report the latest packet had been flushed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-09 18:30:24 +02:00
Michael Niedermayer
962654f251
Merge commit 'b380337020e271c5431aa8ef8f8e9dfda5e919b2'
...
* commit 'b380337020e271c5431aa8ef8f8e9dfda5e919b2':
mpjpegdec: don't try to alloc an AVIOContext when probe is guaranteed to fail
See: 1382add59d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-09 18:09:26 +02:00
Michael Niedermayer
551813a963
Merge commit '210921722bf828b3b895ebcbc34374e6c4452c6f'
...
* commit '210921722bf828b3b895ebcbc34374e6c4452c6f':
imc: add required padding for GetBitContext buffer
Conflicts:
libavcodec/imc.c
See: 7444cf9a9c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-09 17:44:13 +02:00
Michael Niedermayer
840465ebf9
Merge commit '09447f2b0fafac6d9565aab82a4c5f16fc99ee5e'
...
* commit '09447f2b0fafac6d9565aab82a4c5f16fc99ee5e':
ac3_parser: add required padding for GetBitContext buffer
See: fccd85b9f3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-09 17:35:14 +02:00
Michael Niedermayer
5f48a73bb0
Merge commit 'fb1473080223a634b8ac2cca48a632d037a0a69d'
...
* commit 'fb1473080223a634b8ac2cca48a632d037a0a69d':
aac_parser: add required padding for GetBitContext buffer
See: fccd85b9f3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-09 17:22:35 +02:00
Rodger Combs
4b082bc241
doc/muxers: document new break_non_keyframes option
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-09 17:08:35 +02:00
Michael Niedermayer
44327cbc9a
avcodec/jpeg2000: Disable special case for JPEG2000_QSTY_SI
...
The code gave apparently completely wrong values
Fixes Ticket2872
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-09 16:44:32 +02:00
Michael Niedermayer
45db921806
avcodec/jpeg2000dec: Add placeholder for PLT parsing
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-09 15:16:46 +02:00
Michael Niedermayer
b6ee1912f9
avcodec/jpeg2000dec: Handle Psot = 0
...
Fixes Ticket2869
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-09 14:43:03 +02:00
Luca Barbato
b14086ca38
mkv: Correctly report the latest packet had been flushed
...
Bug-Id: 865
CC: libav-stable@libav.org
2015-06-09 14:27:54 +02:00
Rodger Combs
e60b018c74
lavf/segment: add an option to allow breaking on non-keyframes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-09 13:26:00 +02:00
James Almer
b380337020
mpjpegdec: don't try to alloc an AVIOContext when probe is guaranteed to fail
...
The first check is done without the AVIOContext, so alloc it only if said check succeeds
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
2015-06-09 10:07:11 +02:00
Janne Grunau
210921722b
imc: add required padding for GetBitContext buffer
...
Fixes stack buffer overflow errors detected by address sanitizer in
fate-imc.
CC: libav-stable@libav.org
2015-06-09 10:07:04 +02:00
Janne Grunau
09447f2b0f
ac3_parser: add required padding for GetBitContext buffer
...
Fixes stack buffer overflow errors detected by address sanitizer in
various fate tests.
CC: libav-stable@libav.org
2015-06-09 10:06:59 +02:00
Janne Grunau
fb14730802
aac_parser: add required padding for GetBitContext buffer
...
Fixes stack buffer overflow errors detected by address sanitizer in
various fate tests.
CC: libav-stable@libav.org
2015-06-09 10:05:54 +02:00
Michael Niedermayer
e100966575
avcodec/x86/h264_weight: handle weight1=128
...
Fix ticket4596
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-09 05:11:09 +02:00
Michael Niedermayer
7c9fcdfabd
avcodec/jpeg2000dec: Fix some 5/3 bitexactness issues
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-09 02:17:53 +02:00
Rodger Combs
ecefce41d9
lavf/tls_securetransport: fix SNI support when not verifying
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-09 01:06:32 +02:00
Michael Niedermayer
074159ed70
avcodec/jpeg2000dec: Fix subsampled decoding
...
Fixes part of Ticket3619
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-09 01:02:05 +02:00
Michael Niedermayer
12ba1b2b4d
avcodec/jpeg2000dec: Check that coords match before applying ICT
...
This avoid potential out of array accesses
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-09 01:02:05 +02:00
Michael Niedermayer
028c59c17b
avcodec/jpeg2000dec: Fix high bit depth branch sample shift
...
Fix part of Ticket3619
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-09 01:01:01 +02:00
Andreas Cadhalpun
6fdbaa2b7f
vp8: change mv_{min,max}.{x,y} type to int
...
If one of the dimensions is larger than 8176, s->mb_width or
s->mb_height is larger than 511, leading to an int16_t overflow of
s->mv_max.{x,y}. This then causes av_clip to be called with amin > amax.
Changing the type to int avoids the overflow and has no negative
effect, because s->mv_max is only used in clamp_mv for clipping.
Since mv_max.{x,y} is positive and mv_min.{x,y} negative, av_clip can't
increase the absolute value. The input to av_clip is an int16_t, and
thus the output fits into int16_t as well.
For additional safety, s->mv_{min,max}.{x,y} are clipped to int16_t range
before use.
Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-06-08 23:29:14 +02:00
James Almer
1382add59d
mpjpegdec: don't try to alloc an AVIOContext when probe is guaranteed to fail
...
The first check is done without the AVIOContext, so alloc it only if said check succeeds
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
2015-06-08 18:26:42 -03:00
Michael Niedermayer
d5a645625d
Merge commit '4733a12dd17a91d606e0079ff9bb48b9f419cbef'
...
* commit '4733a12dd17a91d606e0079ff9bb48b9f419cbef':
rtpdec_asf: Check memory allocation and free memory on error
Conflicts:
libavformat/rtpdec_asf.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-08 23:05:01 +02:00
Michael Niedermayer
3d6635749a
Merge commit '6308cd4868d2bd5fdf8bfa8dd10856c9a91874f5'
...
* commit '6308cd4868d2bd5fdf8bfa8dd10856c9a91874f5':
mov: Check memory allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-08 22:56:51 +02:00
Michael Niedermayer
77510a9698
Merge commit 'bc1eace1b3654c490cb2c226b3c80854244dbb9a'
...
* commit 'bc1eace1b3654c490cb2c226b3c80854244dbb9a':
jack: Check memory allocation
Conflicts:
libavdevice/jack.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-08 22:48:14 +02:00
Michael Niedermayer
d1f7b313ac
Merge commit 'f7e932473314e6ca4c851d49cbde8570b6e66383'
...
* commit 'f7e932473314e6ca4c851d49cbde8570b6e66383':
audiointerleave: Always initialize new_pkt
Conflicts:
libavformat/audiointerleave.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-08 22:37:41 +02:00
Michael Niedermayer
01a6ae1396
Merge commit '8ef98855d25e457094468e2e1a79d9b10d6445b2'
...
* commit '8ef98855d25e457094468e2e1a79d9b10d6445b2':
sctp: Always initialize outmsg struct
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-08 22:35:53 +02:00
Michael Niedermayer
402b18afcc
Merge commit 'caf7be30b11288c498fae67be4741bfbf083d977'
...
* commit 'caf7be30b11288c498fae67be4741bfbf083d977':
mpjpgdec: free AVIOContext leak on early probe fail
Conflicts:
libavformat/mpjpegdec.c
See: 34d278f983
, this was mistakenly reimplemented, also see ffmpeg IRC log of today
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-08 22:15:28 +02:00
Michael Niedermayer
83e3516e64
Merge commit '925b80d64029d41962e5998d7d901226c3a9baea'
...
* commit '925b80d64029d41962e5998d7d901226c3a9baea':
mpegvideo: Move OutFormat enum to mpegutils.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-08 22:05:25 +02:00
Michael Niedermayer
3244a17650
Merge commit '9bb11be0e5a75782c3139ad058c2b571499aa37d'
...
* commit '9bb11be0e5a75782c3139ad058c2b571499aa37d':
mpegvideo: Split picture allocation for encoding and decoding
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-08 21:49:26 +02:00
Andreas Cadhalpun
b18eac7ff2
vp9: change type of tile_size from unsigned to int64_t
...
Otherwise the check 'tile_size < size' treats a negative size as
unsigned, causing the check to pass. This subsequently leads to
segmentation faults.
This was originally fixed as part of Libav commit 72ca83, so the
original author is one of the following developers:
Anton Khirnov <anton@khirnov.net>
Diego Biurrun <diego@biurrun.de>
Luca Barbato <lu_zero@gentoo.org>
Martin Storsjö <martin@martin.st>
Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-06-08 21:43:16 +02:00
Michael Niedermayer
e05fda99f7
Merge commit 'f8716a1408f4f4ec63857b7015fbd62f9eac344a'
...
* commit 'f8716a1408f4f4ec63857b7015fbd62f9eac344a':
mpegvideo: Rework frame_size_alloc function
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-08 21:16:36 +02:00
Michael Niedermayer
db8ae37a78
Merge commit 'da0c8664b4dc906696803685f7e53ade68594ab8'
...
* commit 'da0c8664b4dc906696803685f7e53ade68594ab8':
mpegvideo: Move various temporary buffers to a separate context
Conflicts:
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_motion.c
libavcodec/rv34.c
libavcodec/vc1_mc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-08 21:05:12 +02:00
James Almer
34d278f983
mpjpegdec: fix memory leak in probe function
...
Signed-off-by: James Almer <jamrial@gmail.com>
2015-06-08 16:03:31 -03:00