avformat/brstm: support little-endian s16 PCM

Signed-off-by: Paul B Mahol <onemda@gmail.com>

lavc/adpcm: THP: don't use the ADPC/SEEK table when not seeking

This is almost certainly closer to how the actual Nintendo players work,
and fixes some output pops in files with blank ADPC/SEEK tables (like
those from brawlcustommusic).

lavf/brstm: handle a BFSTM endianness oddity

lavf/brstm: add support for seeking

lavf/brstm: cleanup; fix short-block demuxing

lavf/brstm: move bfstm var to a local

avformat/rawenc: Store sample number for ADX

Fixes Ticket4540

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Support demuxing 4gv codec stored in qcp files

Signed-off-by: Paul B Mahol <onemda@gmail.com>

ffmpeg_opt: Fix handling of creation_time now

Fixes Ticket4495

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

avformat/movenc: Check return code of ff_iso8601_to_unix_time()

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

avcodec/mjpegdec: dont try to combine fields for decimated multiscope 2 material

Fixes Ticket4535

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

libvpxenc: support setting colorspace for vp9

the vp9 bitstream supports 8 values:
unknown (default), bt601, bt709, smpte170, smpte240, bt2020, reserved
and sRGB.

Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Zern <jzern@google.com>

lavc/adpcm: THP: fix indentation

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

avcodec/mqcenc: Remove unused variable

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

libavfilter/formats: Fix parsing of channel specifications with a trailing 'c'.

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

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>

lavf/brstm: allow larger block sizes

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavf/brstm: support little-endian files (BCSTM; 3DS)

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

lavc/adpcm: THP: handle packets with sample counts not divisible by 14

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

lavc: add little-endian ADPCM_THP decoder

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

fate: add avfilter/formats-test

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

avfilter/formats: Add test for ff_parse_channel_layout()

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

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>

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>

avutil/fixed_dsp: remove ff_ prefix from static function

Signed-off-by: James Almer <jamrial@gmail.com>

avcodec/jpeg2000dwt: Fill array using 2d instead of 1d accesses

Avoids gcc warning

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

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>

avcodec/jpeg2000dwt: Fix  special cases in sd_1d53()

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

tests/fate: Add fate-j2k-dwt

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

avcodec/jpeg2000dwt: add test for the 5/3 wavelet

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

avcodec/jpeg2000dwt: Fix order of operations in integer decomposition wavelets

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

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>

avcodec/j2kenc: Support writing JP2 encapsulation

The added option matches openjpeg

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

avcodec/dpxenc: implement write16/32 as functions

Fixes undefined behavior and segfault

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

avutil/avstring: Do not print NULL

Fixes segfault
Fixes Ticket4452

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

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>

avcodec/fic: Add skip_cursor AVOption

Previous version reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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>

avcodec/j2kenc: YUV should not use the ICT

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

avutil/crc: Fix type of p table so its content fits without overflwoing

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

avutil/avstring: Fix undefined shift

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

avutil/aes: Fix types

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

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

avutil/adler32: Fix data type in test code

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

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

avcodec/fft-test: fix type of cpuflags

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

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>

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>

avformat: clarify what package needs to be compiled with SSL support

Try to reduce user confusion.

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

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>

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>

avcodec/hevc_ps: Only discard overread VPS if a previous is available

Fixes Ticket4621

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

avcodec/libx264: Avoid reconfig on equivalent aspect ratios

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

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>

ffmpeg: Free last_frame instead of just unref

Fixes Ticket4611

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

avcodec/jpeg2000dec: Continue decoding reslevels even when empty ones are encountered

Fixes Ticket4635

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

avcodec/ffv1enc: fix bps for >8bit yuv when not explicitly set

Fixes Ticket4636

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

avcodec/flacenc: Regression test for ticket #4628

Corresponding commit: 2469ed32c81ebf2347e6883091c566724b286167

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

Merge commit '1e79d5c6e73ad131f9395f337b58a2b59ee04c1b'

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

See: 7997d78643797d6d26babc4eabbda71049457169
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'd8d124eebcf2ec1f6a1936b12a4f00a48f08e85c'

* commit 'd8d124eebcf2ec1f6a1936b12a4f00a48f08e85c':
  aic: Improve error reporting

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

avcodec/j2kenc: Properly flush the end of the truncated AC stream

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

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>

avcodec/jpeg2000dec: Drop unneeded rlevel variable

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

avcodec/jpeg2000dwt: Support 9/7 singularity cases on the encoder side

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

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>

avcodec/jpeg2000dwt: More special cases to handle singularities in 9/7 decode

Fixes Ticket4634

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

aic: Improve error reporting

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>

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>

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>

swscale/output: Add rgba64/rgb48/bgra64/bgr48 output functions with full chroma interpolation

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

swscale/output: Factorize rgb48 and 64bit code

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

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>

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>

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>

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>

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>

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>

avcodec/jpeg2000dwt: Fix 9/7 IDWT for small sizes

Fixes Ticket4631

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

avcodec/jpeg2000dwt: add special cases for handling length 1 in 5/3 decode

Fixes Ticket4630

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

avcodec/jpeg2000dec: Improve end check

Fixes spurious end mismatch warnings

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

avcodec/jpeg2000dec: Fix term_cnt check

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

MAINTAINERS: add myself as hls encryption maintainer

Signed-off-by: Christian Suloway <csuloway@globaleagleent.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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>

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>

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>

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>

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>

avcodec/jpeg2000dec: increase tile part limit to 32

Fixes Ticket4629

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

avfilter/af_afade: add couple of more curves

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Merge commit 'a4fbd55d6e03eabdbecc3b7892ec09eb8062d066'

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

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

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>

Merge commit '03ca6d70df192125a772dadd01acfe3905aa653f'

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

Conflicts:
libavcodec/libx264.c

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

Merge commit '24ad3ac6a3e20350214e6c3f7a931635f264ae07'

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

Conflicts:
libavformat/nut.h

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

libvpxenc: remove stray '\'s

Signed-off-by: James Zern <jzern@google.com>

libvpxenc: cosmetics: reindent after 2c70436

Signed-off-by: James Zern <jzern@google.com>

Merge commit '07b2db81d06e1cd6b1718d3e2dd7a42e8bccf8c0'

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

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

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>

avcodec/jpeg2000dec: Omit mqc reinit after the last pass

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

doc/filters: add one more compand example found in the wild

Signed-off-by: Paul B Mahol <onemda@gmail.com>

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>

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>