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>

avcodec/jpeg2000dec: Fix Vertically causal context formation

Fixes Ticket4626

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

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>

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>

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

x264: Factor out the reconfiguration code

nut: Drop doxygen markers

avcodec/jpeg2000dec: Improve readability of SOP check

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

riff: Add MNM4 FourCC as mpeg4

avcodec/jpeg2000dec: Remove redundant check

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

avcodec/jpeg2000dec: Check reslevelno in RPCL

Fixes out of array read
Fixes Ticket4627

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

avcodec/jpeg2000dec: Skip SOP

Fixes Ticket4625

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

avcodec/jpeg2000dec: Use <0 instead of != 0 for error checking

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

avcodec/jpeg2000dec: Also include remaining length in "Block length" error message

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

Merge commit '74ea1167d91ccb2e1f2943efa030f2c278b598be'

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

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

avcodec/jpeg2000: Fix regression with multiple tiles

Fixes Ticket 4624

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

avcodec/jpeg2000: Change codeblock coords to same origin as bands

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

avcodec/jpeg2000: Change precinct coords to same origin as bands

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

avcodec/jpeg2000: Fix band coords

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

avcodec/jpeg2000dec: Print warning if the mqc pointer mismatches at the end

If this occurs on valid and correctly decoded files it should be reduced to debug
level

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

tls_gnutls: fix hang on disconnection

GNUTLS_SHUT_RDWR means GnuTLS will keep waiting for the server's
termination reply. But since we don't shutdown the TCP connection at
this point yet, GnuTLS will just keep skipping actual data from the
server, which basically is perceived as hang.

Use GNUTLS_SHUT_WR instead, which doesn't have this problem.

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

avcodec/jpeg2000dec: Show the progression order at debug level for all variants

It was previously shown just for some, this makes it consistent

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

avfilter/af_afade: use av_clipd() instead of nested FFMAX & FFMIN

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

tls_gnutls: fix hang on disconnection

GNUTLS_SHUT_RDWR means GnuTLS will keep waiting for the server's
termination reply. But since we don't shutdown the TCP connection at
this point yet, GnuTLS will just keep skipping actual data from the
server, which basically is perceived as hang.

Use GNUTLS_SHUT_WR instead, which doesn't have this problem.

Signed-off-by: Martin Storsjö <martin@martin.st>

avcodec/jpeg2000dec: Print error messages for more error conditions

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

doc: fix spelling errors

Neccessary -> Necessary
formated   -> formatted
thee       -> the
eventhough -> even though
seperately -> separately

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

avcodec/jpeg2000dec: Handle format that has planes matching YUVA420P structure but seems not to be that

Outputs something for p0_05.j2k

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

avcodec/jpeg2000dec: Print all cdx/cdy values not just the 2nd and 3rd

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

avfilter: bump minor after colorkey addition

avcodec/hevc: Track long and short term RPS size for VDPAU

Today, we track the short term RPS size for DXVA, but only if the
SliceHeader RPS is being used. Otherwise it's left uninitialized.

NVIDIA's VDPAU implementation requires that the size be accurately
tracked even if an SPS RPS is being used. In this case, it's really
counting the size of the RPS idx information, but you end up with
mangled output if the value is not accurate.

VDPAU also needs the size of the long term RPS.

Signed-off-by: Philip Langdale <philipl@overt.org>

avcodec/nvenc: Enable YV12 input format

This has been enabled by recent nvidia driver releases.

Signed-off-by: Philip Langdale <philipl@overt.org>

avcodec/jpeg2000dec: Implement "Reset context probabilities on coding pass boundaries"

No testcase with just this feature known

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

softfloat: make av_div_sf() inline

Removes a defined but not used warning on files including softfloat.h

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>

avcodec/jpeg2000dec: Support RPCL

Fixes Ticket 2792

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

avfilter/vf_colorkey: Add colorkey video filter

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

avformat/singlejpeg: fix standalone compilation

avcodec/jpeg200dsp: add ff_rct_int_{sse2,avx2}

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>

avcodec/jpeg200dsp: add ff_ict_float_{sse,avx}

Original intrinsics version by Nicolas Bertrand.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>

avfilter/drawutils: Assert av_pix_fmt_desc_get() return value in ff_fill_line_with_color()

Theres currently no case where this could be triggered

Found-by: Daemon404
Reviewed-by: Nicolas George <george@nsup.org>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avfilter/lut3d: assert on pixel format descriptor

inlink->format is supposed to be set to a valid format controlled by query_formats().

avfilter/geq: assert on pixel format descriptor

inlink->format is supposed to be set to a valid format controlled by query_formats().

configure: only disable VSX for !ppc64el

This reverts commit 04f0002, which made it impossible to enable VSX with
a generic cpu.

This changes the behavior back to what it was before commit b0af404.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

avcodec/ass_split: check ASSSplitContext alloc

avcodec/jpeg2000dec: Support PCRL

Fixes Ticket4603

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

avcodec/jpeg2000dec: Try to fix remaining DCinema hardcoded TODOs in CPRL

Again, no testcase

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

avcodec/jpeg2000dec: try to correct tile location in CPRL code

No testcase

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

avcodec/jpeg2000dec: Factorize component out of CPRL loop

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

avcodec/jpeg2000dec: Fix x/y step TODO for CPRL

No testcase known

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

Remove a few occurences of "long long" from the libraries.

avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for AVC qpel functions

This patch adds MSA (MIPS-SIMD-Arch) optimizations for AVC qpel functions in new file h264qpel_msa.c
Adds new generic macros (needed for this patch) in libavutil/mips/generic_macros_msa.h

Added const to local static array.

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

examples/decoding_encoding: Use the AVFrame width/height for processing images after decoding

This is what FFmpeg / FFplay do and it is more robust

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ffprobe: check av_asprintf() for failure

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

avcodec/smvjpegdec: assert that the pixel format that has been set by our decoder is valid

If we do check av_pix_fmt_desc_get() then we should fail and
not continue with an invalid pix_fmt

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

avfilter/drawutils: Fix format validity check in ff_draw_init()

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

avutil/imgutils: Simplify pix_fmt validity check in av_image_get_linesize()

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

Merge commit '3b73d5c942f44b37f0e44276ebcfd66c8b12c02d'

* commit '3b73d5c942f44b37f0e44276ebcfd66c8b12c02d':
  fft-test: Use the float fabs() version

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

Merge commit '2d5176fad1a4556d209cbfb0f681712c7eada4fd'

* commit '2d5176fad1a4556d209cbfb0f681712c7eada4fd':
  on2avc: Use the integer abs() version

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

Merge commit 'a7ac1a7b94447f33ae95be4d6d186e2775977f91'

* commit 'a7ac1a7b94447f33ae95be4d6d186e2775977f91':
  flv: Name an enum and use its type

Conflicts:
libavformat/flvdec.c

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

Merge commit '30dfc1dad4285e7362ce3f596d7c5d5d9b7fb33d'

* commit '30dfc1dad4285e7362ce3f596d7c5d5d9b7fb33d':
  cws2fws: Close file handles on error

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

Merge commit 'a9b2a51178ea446909015f061ab5df65e3b66bf6'

* commit 'a9b2a51178ea446909015f061ab5df65e3b66bf6':
  avconv_opt: Check localtime() return value

Conflicts:
ffmpeg_opt.c

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

Merge commit '8a78ae2d2101622fd244b99178d8bc61175c878e'

* commit '8a78ae2d2101622fd244b99178d8bc61175c878e':
  segment: Check open_null_ctx() return value

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

Merge commit 'b7a4127a45b780d76e6b09427a3d0197c4bc1cdb'

* commit 'b7a4127a45b780d76e6b09427a3d0197c4bc1cdb':
  h264_qpel: Use the correct header

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

Merge commit '5e87080f2c73186066df0b9c43877b4af0beef3a'

* commit '5e87080f2c73186066df0b9c43877b4af0beef3a':
  h264_weight: Fix SSSE3 biweight code with weights of 128

Conflicts:
libavcodec/x86/h264_weight.asm

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

Merge commit '64a2e844166d62093b45e680874eea8bd1facf5b'

* commit '64a2e844166d62093b45e680874eea8bd1facf5b':
  eamad: Use the correct headers

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

Merge commit '8606e881b02bec2ac24943d22c8afe11d641fac8'

* commit '8606e881b02bec2ac24943d22c8afe11d641fac8':
  mpeg12: Move the vlc bits to a stand alone file

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

Merge commit 'f1fa1eed2abdc8dfb0af318a43f5d293b81141bd'

* commit 'f1fa1eed2abdc8dfb0af318a43f5d293b81141bd':
  mpegvideo: Expand macro

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

h264: update avctx width/height/pix_fmt when returning frame

Inconsistencies between the dimensions/pixel format of avctx and the
frame can confuse API users.
For example this can crash the demuxing_decoding example.

Back up the previous values and restore them, when decoding the next
frame. This is necessary, because these can be different between the
returned frame and the last decoded frame.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

Merge commit 'e7af52a68dde9144b273a9598b60bf0f56e1323b'

* commit 'e7af52a68dde9144b273a9598b60bf0f56e1323b':
  mpegvideo: rv10: Move function declaration to a separate header

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

Merge commit 'e3d0f49abb20a551bf6d885f75c354d6d0bbeb9d'

* commit 'e3d0f49abb20a551bf6d885f75c354d6d0bbeb9d':
  mpegvideo: h263: Move all tables to a single file

Conflicts:
libavcodec/h263.h
libavcodec/h263data.h

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

Merge commit '8b5007a31b8d1ddbe3661bf45a732336450b7d25'

* commit '8b5007a31b8d1ddbe3661bf45a732336450b7d25':
  mpegvideo: Move ER functions to a separate file

Conflicts:
libavcodec/mpegvideo.c

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

libavcodec/imgconvert.c: support left band while cropping

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

avformat/mxfdec: Detect jpeg2000 through codec_ul too

Fixes Ticket2345

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

doc/filters: add one more zoompan example

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

matroskadec: verify seekhead IDs

Some files have SeekHead elements with broken IDs. They mismatch with
the ID of the destination element. These files are written by
"IDMmkvlib0.1" (as identified by the MuxingApp and WritingApp elements),
and the SeekHead IDs are actually endian-swapped.

This confuses the SeekHead logic of the demuxer. It will read some
elements twice, because the SeekHead ID is used to identify and remember
already read elements. With the file at hand, the stream list was
duplicated by reading the Tracks element twice.

Fix this by rejecting invalid EBML IDs in SeekHead entries. (This fix is
relatively specific to the broken file at hand, and doesn't protect
against some other cases of broken SeekHead, such as valid but
mismatching target element IDs.)

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

avfilter/vf_zoompan: support planar rgb pixel formats

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

fft-test: Use the float fabs() version

Fixes clang warning "absolute value function 'fabsf' given an argument
of type 'double' but has parameter of type 'float' which may cause
truncation of value [-Wabsolute-value]".

on2avc: Use the integer abs() version

Fixes clang warning "floating point absolute value function 'fabsf'
when argument is of integer type [-Wabsolute-value]".

flv: Name an enum and use its type

cws2fws: Close file handles on error

Reported-By: infer

avconv_opt: Check localtime() return value

Reported-By: infer

segment: Check open_null_ctx() return value

Reported-By: infer

h264_qpel: Use the correct header

h264_weight: Fix SSSE3 biweight code with weights of 128

CC: libav-stable@libav.org
Sample-Id: test_bref.mp4

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>