ffmpeg.git
4 years agolibavfilter/formats: Fix parsing of channel specifications with a trailing 'c'.
Simon Thelen [Sat, 20 Jun 2015 16:52:50 +0000 (18:52 +0200)]
libavfilter/formats: Fix parsing of channel specifications with a trailing 'c'.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavc/adpcm: THP: allow channel counts up to 10
Rodger Combs [Sat, 20 Jun 2015 10:01:17 +0000 (05:01 -0500)]
lavc/adpcm: THP: allow channel counts up to 10

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf/brstm: allow larger block sizes
Rodger Combs [Sat, 20 Jun 2015 10:01:16 +0000 (05:01 -0500)]
lavf/brstm: allow larger block sizes

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf/brstm: support little-endian files (BCSTM; 3DS)
Rodger Combs [Sat, 20 Jun 2015 10:01:15 +0000 (05:01 -0500)]
lavf/brstm: support little-endian files (BCSTM; 3DS)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavc/adpcm: THP: handle packets with sample counts not divisible by 14
Rodger Combs [Sat, 20 Jun 2015 10:01:13 +0000 (05:01 -0500)]
lavc/adpcm: THP: handle packets with sample counts not divisible by 14

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavc: add little-endian ADPCM_THP decoder
Rodger Combs [Sat, 20 Jun 2015 10:01:14 +0000 (05:01 -0500)]
lavc: add little-endian ADPCM_THP decoder

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agofate: add avfilter/formats-test
Michael Niedermayer [Sat, 20 Jun 2015 12:07:44 +0000 (14:07 +0200)]
fate: add avfilter/formats-test

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/formats: Add test for ff_parse_channel_layout()
Michael Niedermayer [Sat, 20 Jun 2015 12:01:22 +0000 (14:01 +0200)]
avfilter/formats: Add test for ff_parse_channel_layout()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: Replace TPsot check by assert
Michael Niedermayer [Sat, 20 Jun 2015 02:42:50 +0000 (04:42 +0200)]
avcodec/jpeg2000dec: Replace TPsot check by assert

The condition is impossible now.
the TPsot type is changed to unsigned int to prevent gcc from producing warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: Increase tile part limit to 256
Michael Niedermayer [Sat, 20 Jun 2015 02:38:31 +0000 (04:38 +0200)]
avcodec/jpeg2000dec: Increase tile part limit to 256

This is the maximum that the syntax of jpeg2000 is capable to store

Fixes Ticket4639

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/fixed_dsp: remove ff_ prefix from static function
James Almer [Sat, 20 Jun 2015 06:36:39 +0000 (03:36 -0300)]
avutil/fixed_dsp: remove ff_ prefix from static function

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavcodec/jpeg2000dwt: Fill array using 2d instead of 1d accesses
Michael Niedermayer [Sat, 20 Jun 2015 00:11:56 +0000 (02:11 +0200)]
avcodec/jpeg2000dwt: Fill array using 2d instead of 1d accesses

Avoids gcc warning

Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dwt: Factor dwt test code out so it can be easily used with the other...
Michael Niedermayer [Fri, 19 Jun 2015 23:45:18 +0000 (01:45 +0200)]
avcodec/jpeg2000dwt: Factor dwt test code out so it can be easily used with the other dwts too

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dwt: Fix special cases in sd_1d53()
Michael Niedermayer [Fri, 19 Jun 2015 23:40:17 +0000 (01:40 +0200)]
avcodec/jpeg2000dwt: Fix  special cases in sd_1d53()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agotests/fate: Add fate-j2k-dwt
Michael Niedermayer [Fri, 19 Jun 2015 23:27:27 +0000 (01:27 +0200)]
tests/fate: Add fate-j2k-dwt

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dwt: add test for the 5/3 wavelet
Michael Niedermayer [Fri, 19 Jun 2015 23:24:08 +0000 (01:24 +0200)]
avcodec/jpeg2000dwt: add test for the 5/3 wavelet

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dwt: Fix order of operations in integer decomposition wavelets
Michael Niedermayer [Fri, 19 Jun 2015 22:41:12 +0000 (00:41 +0200)]
avcodec/jpeg2000dwt: Fix order of operations in integer decomposition wavelets

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/j2kenc: Use JP2 format by default
Michael Niedermayer [Fri, 19 Jun 2015 03:13:59 +0000 (05:13 +0200)]
avcodec/j2kenc: Use JP2 format by default

Without the JP2 fields its not possible to identify the colorspace

Fixes Ticket538

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/j2kenc: Support writing JP2 encapsulation
Michael Niedermayer [Fri, 19 Jun 2015 03:13:58 +0000 (05:13 +0200)]
avcodec/j2kenc: Support writing JP2 encapsulation

The added option matches openjpeg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/dpxenc: implement write16/32 as functions
Michael Niedermayer [Fri, 19 Jun 2015 14:46:06 +0000 (16:46 +0200)]
avcodec/dpxenc: implement write16/32 as functions

Fixes undefined behavior and segfault

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/avstring: Do not print NULL
Michael Niedermayer [Fri, 19 Jun 2015 13:57:32 +0000 (15:57 +0200)]
avutil/avstring: Do not print NULL

Fixes segfault
Fixes Ticket4452

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for hpel functions
Shivraj Patil [Sun, 14 Jun 2015 17:56:24 +0000 (23:26 +0530)]
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for hpel functions

This patch adds MSA (MIPS-SIMD-Arch) optimizations for hpel functions in new file hpeldsp_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>
4 years agoavcodec/fic: Add skip_cursor AVOption
Michael Niedermayer [Thu, 18 Jun 2015 10:28:29 +0000 (12:28 +0200)]
avcodec/fic: Add skip_cursor AVOption

Previous version reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibrary.mak: Workaround SDL redefining main and breaking fate tests on mingw
James Almer [Fri, 19 Jun 2015 10:11:16 +0000 (12:11 +0200)]
library.mak: Workaround SDL redefining main and breaking fate tests on mingw

Fixes Ticket3368

Commit message by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/j2kenc: YUV should not use the ICT
Michael Niedermayer [Fri, 19 Jun 2015 02:51:59 +0000 (04:51 +0200)]
avcodec/j2kenc: YUV should not use the ICT

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/crc: Fix type of p table so its content fits without overflwoing
Michael Niedermayer [Fri, 19 Jun 2015 00:16:49 +0000 (02:16 +0200)]
avutil/crc: Fix type of p table so its content fits without overflwoing

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/avstring: Fix undefined shift
Michael Niedermayer [Fri, 19 Jun 2015 00:13:08 +0000 (02:13 +0200)]
avutil/avstring: Fix undefined shift

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/aes: Fix types
Michael Niedermayer [Fri, 19 Jun 2015 00:11:40 +0000 (02:11 +0200)]
avutil/aes: Fix types

Fixes "warning: argument #2 is incompatible with prototype:"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/adler32: Fix data type in test code
Michael Niedermayer [Fri, 19 Jun 2015 00:09:50 +0000 (02:09 +0200)]
avutil/adler32: Fix data type in test code

Fixes "warning: argument #2 is incompatible with prototype:"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/fft-test: fix type of cpuflags
Michael Niedermayer [Fri, 19 Jun 2015 00:08:06 +0000 (02:08 +0200)]
avcodec/fft-test: fix type of cpuflags

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agopostproc: fix unaligned access
Andreas Cadhalpun [Thu, 18 Jun 2015 18:15:12 +0000 (20:15 +0200)]
postproc: fix unaligned access

QP_store is only 8-bit-aligned, so accessing it as uint32_t causes
SIGBUS crashes on sparc.
The AV_RN32/AV_WN32 macros only do unaligned access in the
HAVE_FAST_UNALIGNED case.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agovp9: don't retain NULL as segmentation_map
Andreas Cadhalpun [Wed, 17 Jun 2015 17:02:15 +0000 (19:02 +0200)]
vp9: don't retain NULL as segmentation_map

This fixes segmentation faults, which were introduced in commit
4ba8f327.

Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agoavformat: clarify what package needs to be compiled with SSL support
wm4 [Thu, 18 Jun 2015 18:36:19 +0000 (20:36 +0200)]
avformat: clarify what package needs to be compiled with SSL support

Try to reduce user confusion.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoid3v2: strip trailing spaces from APIC tag
wm4 [Thu, 7 May 2015 21:56:37 +0000 (23:56 +0200)]
id3v2: strip trailing spaces from APIC tag

The APIC description must be unique, and some ID3v2 tag writers add
spaces to write several APIC entries with the same description. The
trailing spaces simply serve as a way to disambiguate the description.
Do this so that API users do not have to special-case mp3 to fix this
cosmetic issue.

Requested-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/id3v2: detect PNG by header instead of mime
Michael Niedermayer [Thu, 18 Jun 2015 16:37:39 +0000 (18:37 +0200)]
avformat/id3v2: detect PNG by header instead of mime

the mimetype for PNG can be set to jpeg

Fixes 01\ -\ Cider\ Time.mp3

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/hevc_ps: Only discard overread VPS if a previous is available
Michael Niedermayer [Thu, 18 Jun 2015 16:03:21 +0000 (18:03 +0200)]
avcodec/hevc_ps: Only discard overread VPS if a previous is available

Fixes Ticket4621

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/libx264: Avoid reconfig on equivalent aspect ratios
Michael Niedermayer [Thu, 18 Jun 2015 12:40:11 +0000 (14:40 +0200)]
avcodec/libx264: Avoid reconfig on equivalent aspect ratios

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for qpel functions
Shivraj Patil [Sun, 14 Jun 2015 17:56:23 +0000 (23:26 +0530)]
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for qpel functions

This patch adds MSA (MIPS-SIMD-Arch) optimizations for qpel functions in new file qpeldsp_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>
4 years agoffmpeg: Free last_frame instead of just unref
Michael Niedermayer [Thu, 18 Jun 2015 03:27:08 +0000 (05:27 +0200)]
ffmpeg: Free last_frame instead of just unref

Fixes Ticket4611

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: Continue decoding reslevels even when empty ones are encountered
Michael Niedermayer [Thu, 18 Jun 2015 00:22:45 +0000 (02:22 +0200)]
avcodec/jpeg2000dec: Continue decoding reslevels even when empty ones are encountered

Fixes Ticket4635

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/ffv1enc: fix bps for >8bit yuv when not explicitly set
Michael Niedermayer [Wed, 17 Jun 2015 22:34:59 +0000 (00:34 +0200)]
avcodec/ffv1enc: fix bps for >8bit yuv when not explicitly set

Fixes Ticket4636

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/flacenc: Regression test for ticket #4628
George Boyle [Wed, 17 Jun 2015 13:51:16 +0000 (14:51 +0100)]
avcodec/flacenc: Regression test for ticket #4628

Corresponding commit: 2469ed32c81ebf2347e6883091c566724b286167

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '1e79d5c6e73ad131f9395f337b58a2b59ee04c1b'
Michael Niedermayer [Wed, 17 Jun 2015 18:59:59 +0000 (20:59 +0200)]
Merge commit '1e79d5c6e73ad131f9395f337b58a2b59ee04c1b'

* commit '1e79d5c6e73ad131f9395f337b58a2b59ee04c1b':
  libwebpenc: use WebPMemoryWriterClear()

See: 7997d78643797d6d26babc4eabbda71049457169
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'd8d124eebcf2ec1f6a1936b12a4f00a48f08e85c'
Michael Niedermayer [Wed, 17 Jun 2015 18:53:06 +0000 (20:53 +0200)]
Merge commit 'd8d124eebcf2ec1f6a1936b12a4f00a48f08e85c'

* commit 'd8d124eebcf2ec1f6a1936b12a4f00a48f08e85c':
  aic: Improve error reporting

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/j2kenc: Properly flush the end of the truncated AC stream
Michael Niedermayer [Wed, 17 Jun 2015 18:13:05 +0000 (20:13 +0200)]
avcodec/j2kenc: Properly flush the end of the truncated AC stream

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mqcenc: Add ff_mqc_flush_to()
Michael Niedermayer [Wed, 17 Jun 2015 18:11:43 +0000 (20:11 +0200)]
avcodec/mqcenc: Add ff_mqc_flush_to()

This is needed to separate the end padding from the bitstream, allowing
to end it multiple times without disturbing it.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: Drop unneeded rlevel variable
Michael Niedermayer [Wed, 17 Jun 2015 13:48:12 +0000 (15:48 +0200)]
avcodec/jpeg2000dec: Drop unneeded rlevel variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dwt: Support 9/7 singularity cases on the encoder side
Michael Niedermayer [Wed, 17 Jun 2015 13:24:14 +0000 (15:24 +0200)]
avcodec/jpeg2000dwt: Support 9/7 singularity cases on the encoder side

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibwebpenc: use WebPMemoryWriterClear()
James Almer [Tue, 16 Jun 2015 16:27:20 +0000 (17:27 +0100)]
libwebpenc: use WebPMemoryWriterClear()

WebPMemoryWriterClear() must be used instead of free() when
libwebp ABI version is > 0x0203.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agoavcodec/jpeg2000dwt: More special cases to handle singularities in 9/7 decode
Michael Niedermayer [Wed, 17 Jun 2015 12:45:15 +0000 (14:45 +0200)]
avcodec/jpeg2000dwt: More special cases to handle singularities in 9/7 decode

Fixes Ticket4634

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoaic: Improve error reporting
Vittorio Giovara [Mon, 15 Jun 2015 17:27:53 +0000 (18:27 +0100)]
aic: Improve error reporting

4 years agoavcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for H263 lpf functions
Shivraj Patil [Sun, 14 Jun 2015 17:56:22 +0000 (23:26 +0530)]
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for H263 lpf functions

This patch adds MSA (MIPS-SIMD-Arch) optimizations for H263 lpf functions in new file h263dsp_msa.c

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf/brstm: add support for BFSTM files
Rodger Combs [Wed, 17 Jun 2015 08:09:52 +0000 (03:09 -0500)]
lavf/brstm: add support for BFSTM files

Previous version reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavio: fix potential crashes when combining ffio_ensure_seekback + crc
wm4 [Tue, 16 Jun 2015 22:21:02 +0000 (00:21 +0200)]
avio: fix potential crashes when combining ffio_ensure_seekback + crc

Calling ffio_ensure_seekback() if ffio_init_checksum() has been called
on the same context can lead to out of bounds memory accesses and
crashes. The reason is that ffio_ensure_seekback() does not update
checksum_ptr after reallocating the buffer, resulting in a dangling
pointer.

This effectively fixes potential crashes when opening mp3 files.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswscale/output: Add rgba64/rgb48/bgra64/bgr48 output functions with full chroma inter...
Michael Niedermayer [Tue, 16 Jun 2015 22:01:47 +0000 (00:01 +0200)]
swscale/output: Add rgba64/rgb48/bgra64/bgr48 output functions with full chroma interpolation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswscale/output: Factorize rgb48 and 64bit code
Michael Niedermayer [Tue, 16 Jun 2015 21:35:23 +0000 (23:35 +0200)]
swscale/output: Factorize rgb48 and 64bit code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dwt: assert that mod == 0 for encoding
Michael Niedermayer [Tue, 16 Jun 2015 19:22:40 +0000 (21:22 +0200)]
avcodec/jpeg2000dwt: assert that mod == 0 for encoding

We are missing the handling of some special cases for this.
These cases should be unused and there should be no reason
to ever use them unless some spec dictates their use

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc: avoid incorrect phrase 'allows to'
Andreas Cadhalpun [Sun, 14 Jun 2015 18:28:28 +0000 (20:28 +0200)]
doc: avoid incorrect phrase 'allows to'

Also fix typo found by Lou Logan:
Sacrifying -> Sacrificing

Reviewed-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agoconfigure: make makeinfo_html check more robust
Andreas Cadhalpun [Sat, 13 Jun 2015 18:24:27 +0000 (20:24 +0200)]
configure: make makeinfo_html check more robust

The current check is too strict for newer makeinfo versions.
Existing version strings are:
makeinfo (GNU texinfo) 4.13
makeinfo (GNU texinfo) 5.2
texi2any (GNU texinfo) 5.9.93

Probably version 6 will come in the not too far future.

Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agomatroskadec: validate audio channels and bitdepth
Andreas Cadhalpun [Mon, 15 Jun 2015 19:06:51 +0000 (21:06 +0200)]
matroskadec: validate audio channels and bitdepth

In the TTA extradata re-construction the values are written with
avio_wl16 and if they don't fit into uint16_t, this triggers an
av_assert2 in avio_w8.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agomatroskadec: check audio sample rate
Andreas Cadhalpun [Mon, 15 Jun 2015 18:59:22 +0000 (20:59 +0200)]
matroskadec: check audio sample rate

And default to 8000 if it is invalid.

An invalid sample rate can trigger av_assert2 in av_rescale_rnd.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agoavcodec/codec_desc: rename smv video codec name to smvjpeg to match decoder name
Paul B Mahol [Tue, 16 Jun 2015 13:28:34 +0000 (13:28 +0000)]
avcodec/codec_desc: rename smv video codec name to smvjpeg to match decoder name

Also fixes clash with smv audio codec.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavcodec/jpeg2000dwt: Fix 9/7 IDWT for small sizes
Michael Niedermayer [Tue, 16 Jun 2015 18:33:54 +0000 (20:33 +0200)]
avcodec/jpeg2000dwt: Fix 9/7 IDWT for small sizes

Fixes Ticket4631

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dwt: add special cases for handling length 1 in 5/3 decode
Michael Niedermayer [Tue, 16 Jun 2015 18:00:39 +0000 (20:00 +0200)]
avcodec/jpeg2000dwt: add special cases for handling length 1 in 5/3 decode

Fixes Ticket4630

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: Improve end check
Michael Niedermayer [Tue, 16 Jun 2015 16:34:20 +0000 (18:34 +0200)]
avcodec/jpeg2000dec: Improve end check

Fixes spurious end mismatch warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: Fix term_cnt check
Michael Niedermayer [Tue, 16 Jun 2015 16:31:59 +0000 (18:31 +0200)]
avcodec/jpeg2000dec: Fix term_cnt check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMAINTAINERS: add myself as hls encryption maintainer
Christian Suloway [Tue, 16 Jun 2015 14:15:57 +0000 (09:15 -0500)]
MAINTAINERS: add myself as hls encryption maintainer

Signed-off-by: Christian Suloway <csuloway@globaleagleent.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/hlsenc: removed empty/unused print_encryption_tag function
Christian Suloway [Tue, 16 Jun 2015 14:15:56 +0000 (09:15 -0500)]
avformat/hlsenc: removed empty/unused print_encryption_tag function

Signed-off-by: Christian Suloway <csuloway@globaleagleent.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mxfdec: Change version byte for JPEG2000 to match mxf.c and RP224v12
Michael Niedermayer [Mon, 15 Jun 2015 12:13:22 +0000 (14:13 +0200)]
avformat/mxfdec: Change version byte for JPEG2000 to match mxf.c and RP224v12

This should make no difference as the byte is ignored

Found-by: tim nicholson <nichot20@yahoo.com>
Reviewed-by: tim nicholson <nichot20@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/flacenc: Fix Invalid Rice order
George Boyle [Tue, 16 Jun 2015 07:25:01 +0000 (08:25 +0100)]
avcodec/flacenc: Fix Invalid Rice order

Fixes ticket #4628.

The problem arose, in the sample file at least, in the last block where the
minimum and maximum Rice partition orders were both 0. In that case, and any
other where pmax == pmin, the original UINT32_MAX placeholder value for
bits[opt_porder] was getting overwritten before the comparison to check if the
current partition order is a new optimal, so the correct partition order and
RiceContext params were not being set.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc/muxers.texi: properly insert {}s in example
James Zern [Tue, 16 Jun 2015 06:04:45 +0000 (23:04 -0700)]
doc/muxers.texi: properly insert {}s in example

use '@{' / '@}', fixes compile errors:
*** '{' without macro. Before: 1:-'.'}
*** '}' without opening '{' before:

since:
907ac20 avformat/hlsenc: added HLS encryption

Signed-off-by: James Zern <jzern@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/hlsenc: added HLS encryption
Christian Suloway [Mon, 15 Jun 2015 18:58:07 +0000 (10:58 -0800)]
avformat/hlsenc: added HLS encryption

Added HLS encryption with -hls_key_info_file <key_info_file> option. The
first line of key_info_file specifies the key URI written to the
playlist. The key URL is used to access the encryption key during
playback. The second line specifies the path to the key file used to
obtain the key during the encryption process. The key file is read as a
single packed array of 16 octets in binary format. The optional third
line specifies the initialization vector (IV) as a hexadecimal string to
be used instead of the segment sequence number (default) for encryption.
Changes to key_info_file will result in segment encryption with the new
key/IV and an entry in the playlist for the new key URI/IV.

Key info file format:
<key URI>
<key file path>
<IV> (optional)

Example key URIs:
http://server/file.key
/path/to/file.key
file.key

Example key file paths:
file.key
/path/to/file.key

Example IV:
0123456789ABCDEF0123456789ABCDEF

Example:
ffmpeg -f lavfi -i testsrc -c:v h264 -hls_key_info_file file.keyinfo
foo.m3u8

file.keyinfo:
http://server/file.key
/path/to/file.key
0123456789ABCDEF0123456789ABCDEF

Example shell script:
BASE_URL=${1:-'.'}
openssl rand 16 > file.key
echo $BASE_URL/file.key > file.keyinfo
echo file.key >> file.keyinfo
echo $(openssl rand -hex 16) >> file.keyinfo
ffmpeg -f lavfi -re -i testsrc -c:v h264 -hls_flags delete_segments \
  -hls_key_info_file file.keyinfo out.m3u8
--

Signed-off-by: Christian Suloway <csuloway@globaleagleent.com>
Signed-off-by: Dan Dennedy <dan@dennedy.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: increase tile part limit to 32
Michael Niedermayer [Mon, 15 Jun 2015 20:45:25 +0000 (22:45 +0200)]
avcodec/jpeg2000dec: increase tile part limit to 32

Fixes Ticket4629

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/af_afade: add couple of more curves
Paul B Mahol [Sun, 14 Jun 2015 20:24:18 +0000 (20:24 +0000)]
avfilter/af_afade: add couple of more curves

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoMerge commit 'a4fbd55d6e03eabdbecc3b7892ec09eb8062d066'
Michael Niedermayer [Mon, 15 Jun 2015 20:29:47 +0000 (22:29 +0200)]
Merge commit 'a4fbd55d6e03eabdbecc3b7892ec09eb8062d066'

* commit 'a4fbd55d6e03eabdbecc3b7892ec09eb8062d066':
  h264: er: Copy from the previous reference only if compatible

See: fdc64a104410f5fcc7f35b62287b0ae502b7061a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '9af7e8045e3e63ab39adedae9a7c11b1c410af26'
Michael Niedermayer [Mon, 15 Jun 2015 20:11:43 +0000 (22:11 +0200)]
Merge commit '9af7e8045e3e63ab39adedae9a7c11b1c410af26'

* commit '9af7e8045e3e63ab39adedae9a7c11b1c410af26':
  lavc: Clarify the behaviour of dimension and format context fields

Conflicts:
libavcodec/avcodec.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '03ca6d70df192125a772dadd01acfe3905aa653f'
Michael Niedermayer [Mon, 15 Jun 2015 19:56:26 +0000 (21:56 +0200)]
Merge commit '03ca6d70df192125a772dadd01acfe3905aa653f'

* commit '03ca6d70df192125a772dadd01acfe3905aa653f':
  x264: Factor out the reconfiguration code

Conflicts:
libavcodec/libx264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '24ad3ac6a3e20350214e6c3f7a931635f264ae07'
Michael Niedermayer [Mon, 15 Jun 2015 19:31:09 +0000 (21:31 +0200)]
Merge commit '24ad3ac6a3e20350214e6c3f7a931635f264ae07'

* commit '24ad3ac6a3e20350214e6c3f7a931635f264ae07':
  nut: Drop doxygen markers

Conflicts:
libavformat/nut.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibvpxenc: remove stray '\'s
James Zern [Sat, 13 Jun 2015 17:12:20 +0000 (10:12 -0700)]
libvpxenc: remove stray '\'s

Signed-off-by: James Zern <jzern@google.com>
4 years agolibvpxenc: cosmetics: reindent after 2c70436
James Zern [Sat, 13 Jun 2015 17:10:54 +0000 (10:10 -0700)]
libvpxenc: cosmetics: reindent after 2c70436

Signed-off-by: James Zern <jzern@google.com>
4 years agoMerge commit '07b2db81d06e1cd6b1718d3e2dd7a42e8bccf8c0'
Michael Niedermayer [Mon, 15 Jun 2015 19:09:33 +0000 (21:09 +0200)]
Merge commit '07b2db81d06e1cd6b1718d3e2dd7a42e8bccf8c0'

* commit '07b2db81d06e1cd6b1718d3e2dd7a42e8bccf8c0':
  riff: Add MNM4 FourCC as mpeg4

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoencoders.texi: update libvpx documentation
James Zern [Wed, 10 Jun 2015 03:36:33 +0000 (20:36 -0700)]
encoders.texi: update libvpx documentation

modeled after the libx264 section.

Reviewed-by: Lou Logan <lou@lrcd.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: James Zern <jzern@google.com>
4 years agoavcodec/jpeg2000dec: Omit mqc reinit after the last pass
Michael Niedermayer [Mon, 15 Jun 2015 18:29:32 +0000 (20:29 +0200)]
avcodec/jpeg2000dec: Omit mqc reinit after the last pass

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc/filters: add one more compand example found in the wild
Paul B Mahol [Mon, 15 Jun 2015 17:20:23 +0000 (17:20 +0000)]
doc/filters: add one more compand example found in the wild

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoexamples/demuxing_decoding: use properties from frame instead of video_dec_ctx
Andreas Cadhalpun [Sun, 14 Jun 2015 18:34:16 +0000 (20:34 +0200)]
examples/demuxing_decoding: use properties from frame instead of video_dec_ctx

This is more robust.

And only check if there is actually a frame returned.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agoh264: er: Copy from the previous reference only if compatible
Andreas Cadhalpun [Sun, 14 Jun 2015 10:40:18 +0000 (12:40 +0200)]
h264: er: Copy from the previous reference only if compatible

Also use the frame pixel format instead of the one from the codec
context, which is more robust.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agoavcodec/jpeg2000dec: Fix Vertically causal context formation
Michael Niedermayer [Mon, 15 Jun 2015 16:00:19 +0000 (18:00 +0200)]
avcodec/jpeg2000dec: Fix Vertically causal context formation

Fixes Ticket4626

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mqcdec: set raw flag at the begin of ff_mqc_initdec()
Michael Niedermayer [Mon, 15 Jun 2015 15:11:01 +0000 (17:11 +0200)]
avcodec/mqcdec: set raw flag at the begin of ff_mqc_initdec()

This way it is available to any functions called from ff_mqc_initdec()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoh264: er: Copy from the previous reference only if compatible
Andreas Cadhalpun [Sun, 14 Jun 2015 10:40:18 +0000 (12:40 +0200)]
h264: er: Copy from the previous reference only if compatible

Also use the frame pixel format instead of the one from the codec
context, which is more robust.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agolavc: Clarify the behaviour of dimension and format context fields
Luca Barbato [Sun, 14 Jun 2015 09:45:54 +0000 (11:45 +0200)]
lavc: Clarify the behaviour of dimension and format context fields

The AVCodecContext width, height, coded_width, coded_height and format
are used mainly as decoding hints and they get internally overwritten
during the data parsing stage.

Do not assume they match the last AVFrame provided by
avcodec_decode_video2 and assimilated functions since multi-threading
and other frame reordering might make those values to refer to frames
that will be outputted in the future.

CC: libav-stable@libav.org
4 years agox264: Factor out the reconfiguration code
Luca Barbato [Thu, 11 Jun 2015 22:08:49 +0000 (00:08 +0200)]
x264: Factor out the reconfiguration code

4 years agonut: Drop doxygen markers
Luca Barbato [Thu, 11 Jun 2015 00:40:34 +0000 (02:40 +0200)]
nut: Drop doxygen markers

4 years agoavcodec/jpeg2000dec: Improve readability of SOP check
Michael Niedermayer [Mon, 15 Jun 2015 02:21:40 +0000 (04:21 +0200)]
avcodec/jpeg2000dec: Improve readability of SOP check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoriff: Add MNM4 FourCC as mpeg4
Vittorio Giovara [Fri, 12 Jun 2015 18:12:05 +0000 (19:12 +0100)]
riff: Add MNM4 FourCC as mpeg4

4 years agoavcodec/jpeg2000dec: Remove redundant check
Michael Niedermayer [Mon, 15 Jun 2015 01:11:58 +0000 (03:11 +0200)]
avcodec/jpeg2000dec: Remove redundant check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: Check reslevelno in RPCL
Michael Niedermayer [Mon, 15 Jun 2015 01:00:53 +0000 (03:00 +0200)]
avcodec/jpeg2000dec: Check reslevelno in RPCL

Fixes out of array read
Fixes Ticket4627

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: Skip SOP
Michael Niedermayer [Mon, 15 Jun 2015 00:32:45 +0000 (02:32 +0200)]
avcodec/jpeg2000dec: Skip SOP

Fixes Ticket4625

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: Use <0 instead of != 0 for error checking
Michael Niedermayer [Mon, 15 Jun 2015 00:19:48 +0000 (02:19 +0200)]
avcodec/jpeg2000dec: Use <0 instead of != 0 for error checking

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeg2000dec: Also include remaining length in "Block length" error message
Michael Niedermayer [Sun, 14 Jun 2015 22:32:01 +0000 (00:32 +0200)]
avcodec/jpeg2000dec: Also include remaining length in "Block length" error message

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '74ea1167d91ccb2e1f2943efa030f2c278b598be'
Michael Niedermayer [Sun, 14 Jun 2015 23:30:36 +0000 (01:30 +0200)]
Merge commit '74ea1167d91ccb2e1f2943efa030f2c278b598be'

* commit '74ea1167d91ccb2e1f2943efa030f2c278b598be':
  tls_gnutls: fix hang on disconnection

See: 2222f419da99ef85d49ab04e7e15b76612f4d054
Merged-by: Michael Niedermayer <michaelni@gmx.at>