ffmpeg.git
4 years agoavdevice/lavfi: do not rescale AV_NOPTS_VALUE in lavfi_read_packet() n2.7
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>
(cherry picked from commit 913685f55208efd78bfc34d82b261bd449e69774)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMAINTAINERS: add 2.7
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>
4 years agoUpdate for 2.7
Michael Niedermayer [Tue, 9 Jun 2015 21:21:20 +0000 (23:21 +0200)]
Update for 2.7

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoadd RELEASE_NOTES, based on previous
Michael Niedermayer [Tue, 9 Jun 2015 21:19:54 +0000 (23:19 +0200)]
add RELEASE_NOTES, based on previous

4 years agosonic: set avctx->channels in sonic_decode_init
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>
4 years agoChangelog: Add 2.7 entry
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>
4 years agodoc/APIchanges: fill in missing stuff
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>
4 years agodoc/APIchanges: Add 2.7 separator
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>
4 years agolibavutil/channel_layout: Correctly return layout when channel specification ends...
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>
4 years agolavf/webm_chunk: Remove AVFMT_ALLOW_FLUSH
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>
4 years agoavcodec/jpeg2000dec: Fix gain regression with gray16
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>
4 years agofate: Force jpeg2000 decoder for dcinema
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>
4 years agoavcodec/libopenjpegdec: Mark as experimental if <= 1.3
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>
4 years agoavcodec/jpeg2000: remove unused variable
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>
4 years agoavformat/oggenc: Fix return code in case of flushing
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>
4 years agoMerge commit 'b14086ca38efa1a86cb0f0c6aa147b05f698877b'
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>
4 years agoMerge commit 'b380337020e271c5431aa8ef8f8e9dfda5e919b2'
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>
4 years agoMerge commit '210921722bf828b3b895ebcbc34374e6c4452c6f'
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>
4 years agoMerge commit '09447f2b0fafac6d9565aab82a4c5f16fc99ee5e'
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>
4 years agoMerge commit 'fb1473080223a634b8ac2cca48a632d037a0a69d'
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>
4 years agodoc/muxers: document new break_non_keyframes option
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>
4 years agoavcodec/jpeg2000: Disable special case for JPEG2000_QSTY_SI
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>
4 years agoavcodec/jpeg2000dec: Add placeholder for PLT parsing
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>
4 years agoavcodec/jpeg2000dec: Handle Psot = 0
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>
4 years agomkv: Correctly report the latest packet had been flushed
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
4 years agolavf/segment: add an option to allow breaking on non-keyframes
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>
4 years agompjpegdec: don't try to alloc an AVIOContext when probe is guaranteed to fail
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>
4 years agoimc: add required padding for GetBitContext buffer
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
4 years agoac3_parser: add required padding for GetBitContext buffer
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
4 years agoaac_parser: add required padding for GetBitContext buffer
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
4 years agoavcodec/x86/h264_weight: handle weight1=128
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>
4 years agoavcodec/jpeg2000dec: Fix some 5/3 bitexactness issues
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>
4 years agolavf/tls_securetransport: fix SNI support when not verifying
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>
4 years agoavcodec/jpeg2000dec: Fix subsampled decoding
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>
4 years agoavcodec/jpeg2000dec: Check that coords match before applying ICT
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>
4 years agoavcodec/jpeg2000dec: Fix high bit depth branch sample shift
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>
4 years agovp8: change mv_{min,max}.{x,y} type to int
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>
4 years agompjpegdec: don't try to alloc an AVIOContext when probe is guaranteed to fail
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>
4 years agoMerge commit '4733a12dd17a91d606e0079ff9bb48b9f419cbef'
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>
4 years agoMerge commit '6308cd4868d2bd5fdf8bfa8dd10856c9a91874f5'
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>
4 years agoMerge commit 'bc1eace1b3654c490cb2c226b3c80854244dbb9a'
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>
4 years agoMerge commit 'f7e932473314e6ca4c851d49cbde8570b6e66383'
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>
4 years agoMerge commit '8ef98855d25e457094468e2e1a79d9b10d6445b2'
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>
4 years agoMerge commit 'caf7be30b11288c498fae67be4741bfbf083d977'
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>
4 years agoMerge commit '925b80d64029d41962e5998d7d901226c3a9baea'
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>
4 years agoMerge commit '9bb11be0e5a75782c3139ad058c2b571499aa37d'
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>
4 years agovp9: change type of tile_size from unsigned to int64_t
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>
4 years agoMerge commit 'f8716a1408f4f4ec63857b7015fbd62f9eac344a'
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>
4 years agoMerge commit 'da0c8664b4dc906696803685f7e53ade68594ab8'
Michael Niedermayer [Mon, 8 Jun 2015 18:58:13 +0000 (20:58 +0200)]
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>
4 years agompjpegdec: fix memory leak in probe function
James Almer [Mon, 8 Jun 2015 19:02:30 +0000 (16:02 -0300)]
mpjpegdec: fix memory leak in probe function

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoMerge commit 'a6f19d6a9f8d1e08653d9d77581e8c823f4955c2'
Michael Niedermayer [Mon, 8 Jun 2015 18:39:38 +0000 (20:39 +0200)]
Merge commit 'a6f19d6a9f8d1e08653d9d77581e8c823f4955c2'

* commit 'a6f19d6a9f8d1e08653d9d77581e8c823f4955c2':
  configure: Support MSVC 2015

Conflicts:
configure
libavutil/internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswr: Fix ASSERT_LEVEL warning
Michael Niedermayer [Mon, 8 Jun 2015 18:16:06 +0000 (20:16 +0200)]
swr: Fix ASSERT_LEVEL warning

Found-by: cehoyos
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/hq_hqa: Fix signness of tag
Michael Niedermayer [Mon, 8 Jun 2015 16:53:13 +0000 (18:53 +0200)]
avcodec/hq_hqa: Fix signness of tag

Fixes Ticket4509

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/apng: Add partial support for blending with PAL8 pixel format
Donny Yang [Tue, 2 Jun 2015 15:49:27 +0000 (15:49 +0000)]
avcodec/apng: Add partial support for blending with PAL8 pixel format

Currently restricted to blending pixels that only contain either
0 or 255 in their alpha components

Signed-off-by: Donny Yang <work@kota.moe>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/apng: Add support for blending with GRAY8A pixel format
Donny Yang [Tue, 2 Jun 2015 15:49:26 +0000 (15:49 +0000)]
avcodec/apng: Add support for blending with GRAY8A pixel format

Signed-off-by: Donny Yang <work@kota.moe>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/apng: Add blending support for non-alpha pixel formats
Donny Yang [Tue, 2 Jun 2015 15:49:25 +0000 (15:49 +0000)]
avcodec/apng: Add blending support for non-alpha pixel formats

Signed-off-by: Donny Yang <work@kota.moe>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/apng: Dispose previous frame properly
Donny Yang [Sun, 7 Jun 2015 18:12:30 +0000 (18:12 +0000)]
avcodec/apng: Dispose previous frame properly

The spec specifies the dispose operation as how the current (i.e., currently
being rendered) frame should be disposed when the next frame is blended onto it

This is contrary to ffmpeg's current behaviour of interpreting the dispose
operation as how the previous (i.e., already rendered) frame should be disposed

This patch fixes ffmpeg's behaviour to match those of the spec, which involved
a rewrite of the blending function

Signed-off-by: Donny Yang <work@kota.moe>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf/tls: let the user specify what name to verify against
Rodger Combs [Mon, 8 Jun 2015 09:50:48 +0000 (04:50 -0500)]
lavf/tls: let the user specify what name to verify against

This can be useful for debugging, or in scenarios where the user
doesn't want to use the system's DNS settings for whatever reason.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agortpdec_asf: Check memory allocation and free memory on error
Vittorio Giovara [Wed, 3 Jun 2015 13:16:50 +0000 (14:16 +0100)]
rtpdec_asf: Check memory allocation and free memory on error

CC: libav-stable@libav.org
Bug-Id: CID 1257774

4 years agomov: Check memory allocation
Vittorio Giovara [Wed, 3 Jun 2015 13:16:49 +0000 (14:16 +0100)]
mov: Check memory allocation

CC: libav-stable@libav.org
Bug-Id: CID 1292518

4 years agojack: Check memory allocation
Vittorio Giovara [Wed, 3 Jun 2015 13:16:48 +0000 (14:16 +0100)]
jack: Check memory allocation

CC: libav-stable@libav.org
Bug-Id: CID 1292520

4 years agoaudiointerleave: Always initialize new_pkt
Vittorio Giovara [Wed, 3 Jun 2015 13:16:47 +0000 (14:16 +0100)]
audiointerleave: Always initialize new_pkt

CC: libav-stable@libav.org
Bug-Id: CID 609333

4 years agosctp: Always initialize outmsg struct
Vittorio Giovara [Wed, 3 Jun 2015 13:16:45 +0000 (14:16 +0100)]
sctp: Always initialize outmsg struct

CC: libav-stable@libav.org
Bug-Id: CID 1302711

4 years agompjpgdec: free AVIOContext leak on early probe fail
Janne Grunau [Mon, 8 Jun 2015 11:31:04 +0000 (13:31 +0200)]
mpjpgdec: free AVIOContext leak on early probe fail

4 years agompegvideo: Move OutFormat enum to mpegutils.h
Vittorio Giovara [Sun, 31 May 2015 13:49:55 +0000 (15:49 +0200)]
mpegvideo: Move OutFormat enum to mpegutils.h

It is necessary to avoid circular header dependencies.

4 years agompegvideo: Split picture allocation for encoding and decoding
Vittorio Giovara [Sun, 31 May 2015 13:49:54 +0000 (15:49 +0200)]
mpegvideo: Split picture allocation for encoding and decoding

The main ff_alloc_picture() function is made more generic with all the
parameters necessary as arguments. This will allows to move most of the
related functions to a separate file later.

Right now wrappers are provided to try and minimize the number of
changes in the code.

4 years agompegvideo: Rework frame_size_alloc function
Vittorio Giovara [Sun, 31 May 2015 13:49:53 +0000 (15:49 +0200)]
mpegvideo: Rework frame_size_alloc function

Use more generic arguments and remove its static attribute since it will
be moved to a separate file.

4 years agompegvideo: Move various temporary buffers to a separate context
Vittorio Giovara [Sun, 31 May 2015 13:49:52 +0000 (15:49 +0200)]
mpegvideo: Move various temporary buffers to a separate context

4 years agoconfigure: Support MSVC 2015
Luca Barbato [Fri, 5 Jun 2015 13:07:06 +0000 (15:07 +0200)]
configure: Support MSVC 2015

The C runtime C99 compatibility had been improved a lot and it now
rejects some of the compatibility defines provided for the older
versions.

Many thanks to Ray for the time spent testing.

Bug-Id: 864
CC: libav-stable@libav.org
4 years agoavformat/mxfenc: Allow overriding /manual setting of the signal standard
Michael Niedermayer [Sat, 6 Jun 2015 01:06:12 +0000 (03:06 +0200)]
avformat/mxfenc: Allow overriding /manual setting of the signal standard

previous patch reviewed-by: tim nicholson <nichot20@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoatrac3plus: give the phase_shift flag a better name.
Max Poliakovski [Sun, 7 Jun 2015 10:52:06 +0000 (12:52 +0200)]
atrac3plus: give the phase_shift flag a better name.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoatrac3plus: add support for GHA phase inversion.
Max Poliakovski [Sat, 6 Jun 2015 21:28:47 +0000 (23:28 +0200)]
atrac3plus: add support for GHA phase inversion.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/version: Bump version for single jpeg muxer
Michael Niedermayer [Mon, 8 Jun 2015 02:00:45 +0000 (04:00 +0200)]
avformat/version: Bump version for single jpeg muxer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc/ffserver: Add entry for missing jpeg variant
Michael Niedermayer [Mon, 8 Jun 2015 01:41:57 +0000 (03:41 +0200)]
doc/ffserver: Add entry for missing jpeg variant

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffserver: Use singlejpeg muxer for jpeg
Caligula useraccount [Mon, 8 Jun 2015 01:32:29 +0000 (03:32 +0200)]
ffserver: Use singlejpeg muxer for jpeg

Fixes Ticket4218

Based on patch by: Otávio Ribeiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat: Add single jpeg muxer
Caligula useraccount [Mon, 8 Jun 2015 01:28:33 +0000 (03:28 +0200)]
avformat: Add single jpeg muxer

Needed to fix Ticket4218

Based on patch by: Otávio Ribeiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/aacdec: Do not return a uninitialized value
Michael Niedermayer [Mon, 8 Jun 2015 00:33:39 +0000 (02:33 +0200)]
avcodec/aacdec: Do not return a uninitialized value

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'bc76c46943272515805d7ac48ca39f14826d1fed'
Michael Niedermayer [Sun, 7 Jun 2015 23:45:54 +0000 (01:45 +0200)]
Merge commit 'bc76c46943272515805d7ac48ca39f14826d1fed'

* commit 'bc76c46943272515805d7ac48ca39f14826d1fed':
  aac: Wait to know the channels before allocating frame

Conflicts:
libavcodec/aacdec.c

See: 676a395ab903cac623c5d6ddd0928c789e08a59e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'a188108ebf28ebac9d2b8fc7d5b391aef45698b3'
Michael Niedermayer [Sun, 7 Jun 2015 23:30:51 +0000 (01:30 +0200)]
Merge commit 'a188108ebf28ebac9d2b8fc7d5b391aef45698b3'

* commit 'a188108ebf28ebac9d2b8fc7d5b391aef45698b3':
  aac: Support channel configurations 11 and 12

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '677c804aa3a78d61b21e6423165a252846c20f0e'
Michael Niedermayer [Sun, 7 Jun 2015 23:19:26 +0000 (01:19 +0200)]
Merge commit '677c804aa3a78d61b21e6423165a252846c20f0e'

* commit '677c804aa3a78d61b21e6423165a252846c20f0e':
  aac: correctly map 7.1ch-wide AAC from FDK AAC encoder

Sample: FDK_7.1ch_wide.aac
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '252d6200c36e7eaa79f8d5205b7d731179e94897'
Michael Niedermayer [Sun, 7 Jun 2015 23:10:11 +0000 (01:10 +0200)]
Merge commit '252d6200c36e7eaa79f8d5205b7d731179e94897'

* commit '252d6200c36e7eaa79f8d5205b7d731179e94897':
  avio: Add avio_put_str16be

Conflicts:
doc/APIchanges
libavformat/avio.h
libavformat/aviobuf.c
libavformat/version.h

The FFmpeg implementation is kept as requested by ubitux
Doxy improvements merged

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '9b56ac74b170d12027fbc81f581a451a709f1105'
Michael Niedermayer [Sun, 7 Jun 2015 22:44:28 +0000 (00:44 +0200)]
Merge commit '9b56ac74b170d12027fbc81f581a451a709f1105'

* commit '9b56ac74b170d12027fbc81f581a451a709f1105':
  mpjpeg: Initial implementation

Conflicts:
Changelog
libavformat/allformats.c
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/hdsenc: Change duration from single to to double precision
Michael Niedermayer [Sun, 7 Jun 2015 22:22:06 +0000 (00:22 +0200)]
avformat/hdsenc: Change duration from single to to double precision

This slightly improves precision

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/rmenc: Remove float usage
Michael Niedermayer [Sun, 7 Jun 2015 19:50:21 +0000 (21:50 +0200)]
avformat/rmenc: Remove float usage

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/libstagefright: Check for pthread_create() failure
Michael Niedermayer [Sun, 7 Jun 2015 18:39:27 +0000 (20:39 +0200)]
avcodec/libstagefright: Check for pthread_create() failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter: fix a few 5 spaces indent
Clément Bœsch [Sun, 7 Jun 2015 18:18:15 +0000 (20:18 +0200)]
avfilter: fix a few 5 spaces indent

4 years agoavdevice/iec61883: Check pthread init for failures
Michael Niedermayer [Sun, 7 Jun 2015 16:57:55 +0000 (18:57 +0200)]
avdevice/iec61883: Check pthread init for failures

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffserver: Check for ffio_set_buf_size() failure
Michael Niedermayer [Sun, 7 Jun 2015 13:00:30 +0000 (15:00 +0200)]
ffserver: Check for ffio_set_buf_size() failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/aviobuf: Check for ffio_set_buf_size() failure
Michael Niedermayer [Sun, 7 Jun 2015 12:57:36 +0000 (14:57 +0200)]
avformat/aviobuf: Check for ffio_set_buf_size() failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/ffmdec: Check ffio_set_buf_size() return value
Michael Niedermayer [Sun, 7 Jun 2015 12:55:10 +0000 (14:55 +0200)]
avformat/ffmdec: Check ffio_set_buf_size() return value

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffserver: Check allocations (likely not all)
Michael Niedermayer [Sat, 6 Jun 2015 13:34:17 +0000 (15:34 +0200)]
ffserver: Check allocations (likely not all)

Reviewed-by: "Reynaldo H. Verdejo Pinochet" <reynaldo@osg.samsung.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoaac: Wait to know the channels before allocating frame
Luca Barbato [Thu, 4 Jun 2015 08:19:50 +0000 (10:19 +0200)]
aac: Wait to know the channels before allocating frame

The channel configuration can be delivered only by the PCE,
try to parse it first and not try to decode until a channel
configuration is set.

CC: libav-stable@libav.org
4 years agoaac: Support channel configurations 11 and 12
Sebastian Dröge [Thu, 4 Jun 2015 13:35:51 +0000 (15:35 +0200)]
aac: Support channel configurations 11 and 12

These are defined in ISO/IEC 14496-3:2009/PDAM 4 for 6.1 and 7.1.
It also defines another 7.1 layout with configuration 14, that one
is not added here for now.

11: 3/3.1    FC FL+FR BL+BR BC LFE
12: 3/2/2.1  FC FL+FR SiL+SiR BL+BR LFE

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agoaac: correctly map 7.1ch-wide AAC from FDK AAC encoder
nu774 [Thu, 4 Jun 2015 05:42:08 +0000 (14:42 +0900)]
aac: correctly map 7.1ch-wide AAC from FDK AAC encoder

FDK AAC encoder outputs SCE(front)+CPE(front)+CPE(back)+CPE(back) on
MODE_7_1_REAR_SURROUND configuration.
Since decoder couldn't properly map 4 back channels, decoding failed
unless -request_channel_layout 0x8000000000000000 has been specified.
Now we treat first CPE(back) as CPE(side) on channel mapping.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agoavio: Add avio_put_str16be
Luca Barbato [Fri, 5 Jun 2015 21:21:18 +0000 (23:21 +0200)]
avio: Add avio_put_str16be

4 years agompjpeg: Initial implementation
Luca Barbato [Sat, 16 May 2015 15:03:28 +0000 (17:03 +0200)]
mpjpeg: Initial implementation

Support only streams with Content-Length.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agofate: add missing avdevice dependency to closed caption test
James Almer [Sun, 7 Jun 2015 04:24:31 +0000 (01:24 -0300)]
fate: add missing avdevice dependency to closed caption test

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavcodec/allcodecs: Re-order nvenc encoders below x264/5.
Philip Langdale [Sat, 6 Jun 2015 20:21:56 +0000 (13:21 -0700)]
avcodec/allcodecs: Re-order nvenc encoders below x264/5.

We shouldn't pick nvenc by default.

Signed-off-by: Philip Langdale <philipl@overt.org>
4 years agovf_colormatrix: calculate coefficients only once
Ganesh Ajjanagadde [Fri, 5 Jun 2015 20:05:18 +0000 (16:05 -0400)]
vf_colormatrix: calculate coefficients only once

calc_coefficients is no longer being called every frame

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mpegvideo: Use av_memdup() for allocating thread_context
Michael Niedermayer [Sat, 6 Jun 2015 19:28:54 +0000 (21:28 +0200)]
avcodec/mpegvideo: Use av_memdup() for allocating thread_context

Also check for allocation failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>