Michael Niedermayer [Fri, 12 Jun 2015 14:28:53 +0000 (16:28 +0200)]
avcodec/jpeg2000dec: Fallback to yuv if no matching xyz format exists
Fixes Ticket4471
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Jun 2015 14:26:27 +0000 (16:26 +0200)]
avcodec/jpeg2000dec: Do not abort if prc is outside limits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Jun 2015 13:36:20 +0000 (15:36 +0200)]
ffmpeg_opt: Check for localtime() failure
Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Jun 2015 13:03:49 +0000 (15:03 +0200)]
Mark vectors as NAN instead of dereferencing NULL pointers on malloc failure
Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Jun 2015 12:39:28 +0000 (14:39 +0200)]
swscale: Assert that pixel format descriptor is not NULL
This may help static analyzers, the pixel format is checked
during initialization
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Jun 2015 12:33:53 +0000 (14:33 +0200)]
avcodec/jpeg2000dec: Assert that pixel format descriptor is not NULL
We only look up pixel formats from a fixed list so none should ever
fail to be found
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 4 Jun 2015 21:46:21 +0000 (23:46 +0200)]
avformat/mpegts: recognizes and export private streams
Based on patch by Wolfgang Lorenz <wl-chmw@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Jun 2015 11:20:25 +0000 (13:20 +0200)]
configure: Disable VSX on unspecified / generic CPUs
Fixes fate tests on PPC64be
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Jun 2015 02:35:18 +0000 (04:35 +0200)]
avcodec/jpeg2000dec: Do not hardcode tile part usage
Fixes part of Ticket 4605
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Jun 2015 02:36:38 +0000 (04:36 +0200)]
avcodec/jpeg2000dec: Do not print a warning for RLCP
It seems to be working now
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Jun 2015 01:33:31 +0000 (03:33 +0200)]
avcodec/jpeg2000dec: Remove unused variable and argument
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Jun 2015 01:06:56 +0000 (03:06 +0200)]
avcodec/jpeg2000dec: Fix Selective arithmetic coding bypass and Multiple codeword segments
These 2 are highly related so they are in the same commit
Fixes part of Ticket4605
Fixes p0_04.j2k
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Jun 2015 01:02:09 +0000 (03:02 +0200)]
avcodec/mqcdec: Support raw bypass and non reseting init
Some broken code that used the old mqc is removed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Jun 2015 00:02:04 +0000 (02:02 +0200)]
avcodec/jpeg2000dec: add some sanity checking on newpasses
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Jun 2015 23:13:55 +0000 (01:13 +0200)]
avcodec/jpeg2000dec: Add some additional checking on lengthinc
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Jun 2015 20:33:53 +0000 (22:33 +0200)]
avcodec/jpeg2000dec: Print warning for "Selective arithmetic coding bypass"
This is implemented but i suspect does not work correctly as no file using this
seems to decode correctly.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Jun 2015 19:10:44 +0000 (21:10 +0200)]
avcodec/jpeg2000dec: Implement progression order RLCP
This works with one of 2 RLCP samples i have, the other appears to also
use selective arithemtic coding bypass which may or may not be the reason why it does
not work
Sample: p0_16.j2k
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Shivraj Patil [Wed, 10 Jun 2015 14:18:40 +0000 (19:48 +0530)]
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for AVC idct functions
This patch adds MSA (MIPS-SIMD-Arch) optimizations for AVC idct functions in new file h264idct_msa.c
Adds new generic macros (needed for this patch) in libavutil/mips/generic_macros_msa.h
Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Shivraj Patil [Wed, 10 Jun 2015 14:18:39 +0000 (19:48 +0530)]
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for AVC intra prediction functions
This patch adds MSA (MIPS-SIMD-Arch) optimizations for AVC intra prediction functions in new file h264pred_msa.c
Adds new generic macros (needed for this patch) in libavutil/mips/generic_macros_msa.h
Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Jun 2015 14:16:38 +0000 (16:16 +0200)]
avutil/softfloat: Move av_sf2double() to header
It was not intended to be a static private function
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Jun 2015 14:12:24 +0000 (16:12 +0200)]
avutil/softfloat: properly separate testcode
This matches how other self tests are implemented
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 2 Jun 2015 16:40:53 +0000 (18:40 +0200)]
avformat/avio: move short seek threshold to the context
This allows us to adjust it internally.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 7 Jun 2015 21:50:13 +0000 (23:50 +0200)]
avformat/aiffdec: avoid double and ldexp()
There is no support for non integer sample rates, using doubles/floats currently could
only lead to rounding differences between platforms
Previous version Reviewed-by: Mark Harris <mark.hsj@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Shivraj Patil [Thu, 11 Jun 2015 08:37:50 +0000 (14:07 +0530)]
avcodec/mips: Add 'const' to static arrays in HEVC MSA code
Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Shivraj Patil [Thu, 11 Jun 2015 05:57:01 +0000 (11:27 +0530)]
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for AVC chroma mc functions
s patch adds MSA (MIPS-SIMD-Arch) optimizations for AVC chroma mc functions in new file h264chroma_msa.c
Adds new generic macros (needed for this patch) in libavutil/mips/generic_macros_msa.h
Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Zern [Sat, 6 Jun 2015 17:24:44 +0000 (10:24 -0700)]
libvpxenc: add overshoot-pct option
balances the presence of undershoot-pct
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Zern <jzern@google.com>
James Zern [Sat, 6 Jun 2015 17:10:56 +0000 (10:10 -0700)]
libvpxenc: add undershoot-pct option
replaces deprecated rc_buffer_aggressivity
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Zern <jzern@google.com>
Michael Niedermayer [Thu, 11 Jun 2015 02:53:37 +0000 (04:53 +0200)]
avcodec/pcm-dvd: Fix debug == FF_DEBUG_PICT_INFO
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Deliang Fu [Wed, 10 Jun 2015 04:30:46 +0000 (12:30 +0800)]
avformat: Fix bug in parse_rps for HEVC.
Make the logic in libavformat/hevc.c parse_rps align with libavcodec/hevc_ps.c ff_hevc_decode_short_term_rps
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 10 Jun 2015 22:28:00 +0000 (00:28 +0200)]
avdevice/openal-dec: Make al_format_info const
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 10 Jun 2015 22:24:54 +0000 (00:24 +0200)]
avformat/movenc: Make static packed_size, const static
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 10 Jun 2015 22:20:46 +0000 (00:20 +0200)]
avcodec/mpeg4videodec: Mark static table as const
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 10 Jun 2015 21:16:59 +0000 (23:16 +0200)]
avformat/mpegts: Do not ignore registration descriptors when probing is enabled
This is required for the (not yet in git) private stream detection/export,
no other testcase known
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lou Logan [Wed, 10 Jun 2015 18:31:47 +0000 (10:31 -0800)]
doc/ffmpeg: remove tips
Ancient and misleading.
Signed-off-by: Lou Logan <lou@lrcd.com>
Michael Niedermayer [Wed, 10 Jun 2015 19:07:55 +0000 (21:07 +0200)]
Merge commit '
c0e6b8cab874db97b6818007bc86507c8d213083'
* commit '
c0e6b8cab874db97b6818007bc86507c8d213083':
mpegvideo: Mark one function as static
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 10 Jun 2015 18:58:26 +0000 (20:58 +0200)]
Merge commit '
d1dd0d404c085f4fce7b8358b4aea677761c5d88'
* commit '
d1dd0d404c085f4fce7b8358b4aea677761c5d88':
mpegvideo: Move block permutation function where is used
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 10 Jun 2015 18:50:36 +0000 (20:50 +0200)]
Merge commit '
c6aa0554b0c3e31fec4580b68ea85b66966cd381'
* commit '
c6aa0554b0c3e31fec4580b68ea85b66966cd381':
mpegvideo: Drop release_unused_pictures() function
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 10 Jun 2015 18:40:18 +0000 (20:40 +0200)]
Merge commit '
7061bf0925a7d6c5899bbe710b2b8cdae9005274'
* commit '
7061bf0925a7d6c5899bbe710b2b8cdae9005274':
mpegvideo: Move Picture-related functions to a separate file
Conflicts:
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 10 Jun 2015 18:18:08 +0000 (20:18 +0200)]
Merge commit '
529c05698e88b057f0bea61e0d85f2b42925b5ea'
* commit '
529c05698e88b057f0bea61e0d85f2b42925b5ea':
movenc: fixes a questionable valgrind uninitialized value warning
See:
3c5c6870a7ffa4997928caddb0802c7a1e5fcfeb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stephan Holljes [Tue, 9 Jun 2015 20:26:48 +0000 (22:26 +0200)]
lavf/http: Correctly terminate session with HTTP POST client.
Send a footer to correctly close client sockets.
This fixes network errors in client applications.
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 10 Jun 2015 14:23:22 +0000 (16:23 +0200)]
avcodec/mips: remove ;;
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Igor Derzhavin [Wed, 10 Jun 2015 11:56:02 +0000 (14:56 +0300)]
libavformat/flvdec.c: don't build index_entries for input stream if AVIOContext is not seekable
Signed-off-by: Igor Derzhavin <igor.derzhavin@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Mon, 8 Jun 2015 12:00:52 +0000 (13:00 +0100)]
mpegvideo: Mark one function as static
Vittorio Giovara [Mon, 8 Jun 2015 12:00:51 +0000 (13:00 +0100)]
mpegvideo: Move block permutation function where is used
Mark it as static.
Vittorio Giovara [Mon, 8 Jun 2015 12:00:50 +0000 (13:00 +0100)]
mpegvideo: Drop release_unused_pictures() function
It is only used in one place, and it is small enough that it might be
called directly.
Vittorio Giovara [Mon, 8 Jun 2015 12:00:49 +0000 (13:00 +0100)]
mpegvideo: Move Picture-related functions to a separate file
Janne Grunau [Tue, 9 Jun 2015 10:27:47 +0000 (12:27 +0200)]
movenc: fixes a questionable valgrind uninitialized value warning
display_matrix_size is only initialized when av_stream_get_side_data()
returns a side data pointer. The code is safe since the only effect this
has is setting the display_matrix pointer to NULL which it was already
anyway.
Shivraj Patil [Thu, 4 Jun 2015 08:01:49 +0000 (13:31 +0530)]
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for HEVC intra prediction functions
This patch adds MSA (MIPS-SIMD-Arch) optimizations for HEVC intra predition functions in new file hevcpred_msa.c
Adds new generic macros (needed for this patch) in libavutil/mips/generic_macros_msa.h
Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Shivraj Patil [Tue, 9 Jun 2015 15:20:26 +0000 (20:50 +0530)]
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for HEVC loop filter and sao functions
This patch adds MSA (MIPS-SIMD-Arch) optimizations for HEVC loop filter and sao functions in new file hevc_lpf_sao_msa.c
Adds new generic macros (needed for this patch) in libavutil/mips/generic_macros_msa.h
In this patch, in comparision with previous patch, duplicated c functions are removed.
Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Cadhalpun [Tue, 9 Jun 2015 22:12:38 +0000 (00:12 +0200)]
takdec: ensure chan2 is a valid channel index
If chan2 is not smaller than the number of channels, it can cause
segmentation faults due to dereferencing a NULL pointer.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 10 Jun 2015 09:37:48 +0000 (11:37 +0200)]
avcodec/h264_slice: Use AVFrame diemensions for grayscale handling
The AVFrame values are closer to the AVFrame bitmap changed instead of
the AVCodecContext values, so this should be more robust
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 10 Jun 2015 02:50:40 +0000 (04:50 +0200)]
avcodec/jpeg2000dec: Print the correct variable in the component error message
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 10 Jun 2015 02:50:14 +0000 (04:50 +0200)]
avcodec/jpeg2000dec: increase tile_parts to 6
Fixes Ticket4602
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 10 Jun 2015 02:19:38 +0000 (04:19 +0200)]
avcodec/jpeg2000dec: Fix shift for RGB(A)48/64
Found-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 9 Jun 2015 22:47:43 +0000 (00:47 +0200)]
avdevice/lavfi: do not rescale AV_NOPTS_VALUE in lavfi_read_packet()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 9 Jun 2015 21:54:46 +0000 (23:54 +0200)]
MAINTAINERS: add 2.7
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Cadhalpun [Tue, 9 Jun 2015 20:41:24 +0000 (22:41 +0200)]
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>
Michael Niedermayer [Tue, 9 Jun 2015 21:14:57 +0000 (23:14 +0200)]
Changelog: Add 2.7 entry
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 9 Jun 2015 21:08:53 +0000 (23:08 +0200)]
doc/APIchanges: fill in missing stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 9 Jun 2015 21:05:07 +0000 (23:05 +0200)]
doc/APIchanges: Add 2.7 separator
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Simon Thelen [Tue, 9 Jun 2015 02:55:57 +0000 (04:55 +0200)]
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>
Vignesh Venkatasubramanian [Tue, 9 Jun 2015 17:02:56 +0000 (10:02 -0700)]
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>
Michael Niedermayer [Tue, 9 Jun 2015 18:26:38 +0000 (20:26 +0200)]
avcodec/jpeg2000dec: Fix gain regression with gray16
Found-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 9 Jun 2015 17:32:55 +0000 (19:32 +0200)]
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>
Michael Niedermayer [Tue, 9 Jun 2015 01:35:07 +0000 (03:35 +0200)]
avcodec/libopenjpegdec: Mark as experimental if <= 1.3
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 9 Jun 2015 16:48:39 +0000 (18:48 +0200)]
avcodec/jpeg2000: remove unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 9 Jun 2015 16:42:55 +0000 (18:42 +0200)]
avformat/oggenc: Fix return code in case of flushing
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 9 Jun 2015 16:18:38 +0000 (18:18 +0200)]
Merge commit '
b14086ca38efa1a86cb0f0c6aa147b05f698877b'
* commit '
b14086ca38efa1a86cb0f0c6aa147b05f698877b':
mkv: Correctly report the latest packet had been flushed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 9 Jun 2015 16:08:41 +0000 (18:08 +0200)]
Merge commit '
b380337020e271c5431aa8ef8f8e9dfda5e919b2'
* commit '
b380337020e271c5431aa8ef8f8e9dfda5e919b2':
mpjpegdec: don't try to alloc an AVIOContext when probe is guaranteed to fail
See:
1382add59df149193620ca0714ceac0929208c88
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 9 Jun 2015 15:43:24 +0000 (17:43 +0200)]
Merge commit '
210921722bf828b3b895ebcbc34374e6c4452c6f'
* commit '
210921722bf828b3b895ebcbc34374e6c4452c6f':
imc: add required padding for GetBitContext buffer
Conflicts:
libavcodec/imc.c
See:
7444cf9a9c0b8b2bba8198af2823521c654a48f4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 9 Jun 2015 15:35:07 +0000 (17:35 +0200)]
Merge commit '
09447f2b0fafac6d9565aab82a4c5f16fc99ee5e'
* commit '
09447f2b0fafac6d9565aab82a4c5f16fc99ee5e':
ac3_parser: add required padding for GetBitContext buffer
See:
fccd85b9f30525f88692f53134eba41f1f2d90db
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 9 Jun 2015 15:21:45 +0000 (17:21 +0200)]
Merge commit '
fb1473080223a634b8ac2cca48a632d037a0a69d'
* commit '
fb1473080223a634b8ac2cca48a632d037a0a69d':
aac_parser: add required padding for GetBitContext buffer
See:
fccd85b9f30525f88692f53134eba41f1f2d90db
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Rodger Combs [Tue, 9 Jun 2015 11:44:51 +0000 (06:44 -0500)]
doc/muxers: document new break_non_keyframes option
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 9 Jun 2015 14:30:35 +0000 (16:30 +0200)]
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>
Michael Niedermayer [Tue, 9 Jun 2015 13:16:46 +0000 (15:16 +0200)]
avcodec/jpeg2000dec: Add placeholder for PLT parsing
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 9 Jun 2015 12:43:03 +0000 (14:43 +0200)]
avcodec/jpeg2000dec: Handle Psot = 0
Fixes Ticket2869
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Tue, 9 Jun 2015 08:47:11 +0000 (10:47 +0200)]
mkv: Correctly report the latest packet had been flushed
Bug-Id: 865
CC: libav-stable@libav.org
Rodger Combs [Tue, 9 Jun 2015 07:32:18 +0000 (02:32 -0500)]
lavf/segment: add an option to allow breaking on non-keyframes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Mon, 8 Jun 2015 20:19:25 +0000 (17:19 -0300)]
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>
Janne Grunau [Mon, 8 Jun 2015 12:48:54 +0000 (14:48 +0200)]
imc: add required padding for GetBitContext buffer
Fixes stack buffer overflow errors detected by address sanitizer in
fate-imc.
CC: libav-stable@libav.org
Janne Grunau [Mon, 8 Jun 2015 12:48:26 +0000 (14:48 +0200)]
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
Janne Grunau [Mon, 8 Jun 2015 12:45:12 +0000 (14:45 +0200)]
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
Michael Niedermayer [Tue, 9 Jun 2015 03:11:09 +0000 (05:11 +0200)]
avcodec/x86/h264_weight: handle weight1=128
Fix ticket4596
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 9 Jun 2015 00:01:40 +0000 (02:01 +0200)]
avcodec/jpeg2000dec: Fix some 5/3 bitexactness issues
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Rodger Combs [Mon, 8 Jun 2015 21:59:32 +0000 (16:59 -0500)]
lavf/tls_securetransport: fix SNI support when not verifying
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 8 Jun 2015 22:27:15 +0000 (00:27 +0200)]
avcodec/jpeg2000dec: Fix subsampled decoding
Fixes part of Ticket3619
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 8 Jun 2015 22:37:26 +0000 (00:37 +0200)]
avcodec/jpeg2000dec: Check that coords match before applying ICT
This avoid potential out of array accesses
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 8 Jun 2015 21:36:59 +0000 (23:36 +0200)]
avcodec/jpeg2000dec: Fix high bit depth branch sample shift
Fix part of Ticket3619
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Cadhalpun [Mon, 8 Jun 2015 20:38:29 +0000 (22:38 +0200)]
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>
James Almer [Mon, 8 Jun 2015 20:39:38 +0000 (17:39 -0300)]
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>
Michael Niedermayer [Mon, 8 Jun 2015 21:05:01 +0000 (23:05 +0200)]
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>
Michael Niedermayer [Mon, 8 Jun 2015 20:56:03 +0000 (22:56 +0200)]
Merge commit '
6308cd4868d2bd5fdf8bfa8dd10856c9a91874f5'
* commit '
6308cd4868d2bd5fdf8bfa8dd10856c9a91874f5':
mov: Check memory allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 8 Jun 2015 20:48:14 +0000 (22:48 +0200)]
Merge commit '
bc1eace1b3654c490cb2c226b3c80854244dbb9a'
* commit '
bc1eace1b3654c490cb2c226b3c80854244dbb9a':
jack: Check memory allocation
Conflicts:
libavdevice/jack.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 8 Jun 2015 20:37:41 +0000 (22:37 +0200)]
Merge commit '
f7e932473314e6ca4c851d49cbde8570b6e66383'
* commit '
f7e932473314e6ca4c851d49cbde8570b6e66383':
audiointerleave: Always initialize new_pkt
Conflicts:
libavformat/audiointerleave.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 8 Jun 2015 20:35:49 +0000 (22:35 +0200)]
Merge commit '
8ef98855d25e457094468e2e1a79d9b10d6445b2'
* commit '
8ef98855d25e457094468e2e1a79d9b10d6445b2':
sctp: Always initialize outmsg struct
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 8 Jun 2015 20:14:18 +0000 (22:14 +0200)]
Merge commit '
caf7be30b11288c498fae67be4741bfbf083d977'
* commit '
caf7be30b11288c498fae67be4741bfbf083d977':
mpjpgdec: free AVIOContext leak on early probe fail
Conflicts:
libavformat/mpjpegdec.c
See:
34d278f9838e355b3b2c7a9c0f77d7fcaf37ce49, this was mistakenly reimplemented, also see ffmpeg IRC log of today
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 8 Jun 2015 20:05:20 +0000 (22:05 +0200)]
Merge commit '
925b80d64029d41962e5998d7d901226c3a9baea'
* commit '
925b80d64029d41962e5998d7d901226c3a9baea':
mpegvideo: Move OutFormat enum to mpegutils.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 8 Jun 2015 19:30:05 +0000 (21:30 +0200)]
Merge commit '
9bb11be0e5a75782c3139ad058c2b571499aa37d'
* commit '
9bb11be0e5a75782c3139ad058c2b571499aa37d':
mpegvideo: Split picture allocation for encoding and decoding
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Cadhalpun [Sun, 7 Jun 2015 16:50:43 +0000 (18:50 +0200)]
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>
Michael Niedermayer [Mon, 8 Jun 2015 19:16:36 +0000 (21:16 +0200)]
Merge commit '
f8716a1408f4f4ec63857b7015fbd62f9eac344a'
* commit '
f8716a1408f4f4ec63857b7015fbd62f9eac344a':
mpegvideo: Rework frame_size_alloc function
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>