avformat/sierravmd: use av_freep() for freeing context fields

This ensures that there are no stale pointers

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

avfilter/vf_stereod3d: add const qualifiers to ana_convert()

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

avfilter/vf_stereo3d: BGR24 support for anaglyphs

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

avfilter/vf_stereo3d: avoid pointless copy

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avpacket: Fix error checking in packet_alloc

Conflicts:
libavcodec/avpacket.c

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

Merge commit '6fc8226e29055858f28973bb3d27b63b3b65e616'

* commit '6fc8226e29055858f28973bb3d27b63b3b65e616':
  vp3: Check the framerate for validity

Conflicts:
libavcodec/vp3.c

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

Merge commit 'ac9d159015a88aa2721b271875d18482f713f354'

* commit 'ac9d159015a88aa2721b271875d18482f713f354':
  proresdec: Properly make sure an index doesn't run past the limit

Conflicts:
libavcodec/proresdec_lgpl.c

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

Merge commit 'e90a6846c2c006fbebd00e1f2789f4a86fafacef'

* commit 'e90a6846c2c006fbebd00e1f2789f4a86fafacef':
  cavsdec: Make sure a sequence header has been decoded before decoding pictures

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

Merge commit '5bbfe193a0a41bd2adb648c8c3f6901a575734a2'

* commit '5bbfe193a0a41bd2adb648c8c3f6901a575734a2':
  vocdec: Don't update codec parameters mid-stream

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

Merge commit '0ef1660a6365ce60ead8858936b6f3f8ea862826'

* commit '0ef1660a6365ce60ead8858936b6f3f8ea862826':
  sierravmd: Do sanity checking of frame sizes

Conflicts:
libavformat/sierravmd.c

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

Merge commit '342c43d154e586bc022c86b168fe8d36f69da9d3'

* commit '342c43d154e586bc022c86b168fe8d36f69da9d3':
  omadec: Properly check lengths before incrementing the position

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

Merge commit 'a06a5b78e2c3bd2e12aff0627a3b65c6fee555a5'

* commit 'a06a5b78e2c3bd2e12aff0627a3b65c6fee555a5':
  mathops/x86: work around inline asm miscompilation with GCC 4.8.1

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

avpacket: Fix error checking in packet_alloc

Previously the wrong buffer pointer was checked, when buf
instead of *buf was checked. But checking the return value
instead is even better.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

vp3: Check the framerate for validity

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

proresdec: Properly make sure an index doesn't run past the limit

If idx equaled num_coeffs - 1 on entry to the loop, the previous
check failed to break out of the loop.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

cavsdec: Make sure a sequence header has been decoded before decoding pictures

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

vocdec: Don't update codec parameters mid-stream

If we really want to support parameter changes, they need to be
signalled along with the AVPackets as parameter change side data,
not just changing the AVCodecContext parameters when a packet
is demuxed (since there may be other earlier packets yet undecoded).

Something similar was already done for the sample rate in 0883109b2,
but some parameters were left changeable.

This avoids having to recheck the channel count for validity for
each decoded frame in (ad)pcm decoders, unless the decoders
explicitly say that they accept parameter changes.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

sierravmd: Do sanity checking of frame sizes

Limit the size to INT_MAX/2 (for simplicity) to be sure that
size + BYTES_PER_FRAME_RECORD won't overflow.

Also factorize other existing error return paths.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

omadec: Properly check lengths before incrementing the position

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

riff: g723_1 decodes vivo g723.1 in asf
works on bellair_digital_movie.asf

avcodec/mjpegdec: rgba64 ljpeg support

Fixes Ticket2965

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

avcodec/mjpegdec: change error return value to be outside the 16bit range

Fixes part of Ticket2965

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

libavfilter/libmpcodecs: remove unused files

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

avcodec/mjpegdec: Fix rgb48 ljpeg

Fixes Ticket894

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

lavf/subtitles: Make comment less arrogant

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>

avcodec: typo fix sepera* → separa*

avfilter/vf_gradfun: use av_calloc()

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

avfilter/vsrc_life: use av_calloc()

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

avcodec/c93: force dimensions to the correct value instead of depending on the demuxer to do so

Fixes Ticket2934

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

mathops/x86: work around inline asm miscompilation with GCC 4.8.1

The volatile is not required here, and prevents a miscompilation with GCC
4.8.1 when building on x86 with --cpu=i686

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

avcodec/g2meet: Fix order of align and pixel size multiplication.

Fixes out of array accesses
Fixes Ticket2922

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

avcodec/jpeg2000dec: print invalid cdx/y values

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

avfilter: avoid testing float == 0

This fixes the hypothetical case of rounding errors causing
incorrect values to be used.
We do not use *_EPSILON, because non trivial expressions can contain
errors larger than that making a zero equality test with *_EPSILON
unreliable.

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

avfilter/af_aecho & af_compand: use extended_data

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

changelog: add ffv1 yuva and dts streamid change

avfilter/avfilter: check allocation failure in ff_insert_pad()

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

matroskadec: Mute "Unknown entry" log messages for CueRelativePosition entries

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mem: Document the non-compatibility of av_realloc() and av_malloc()

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

doc/encoders: improve libvo-aacenc doc

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

doc/encoders: add doc for AAC encoder

Thanks-to: Kostya Shishkov <kostya.shishkov@gmail.com>
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

avcodec/simple_idct_template: adjust coeffs for 12bit idct

This prevents overflows with 12bit jpegs
Fixes Ticket2952

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

matroskaenc: Bump DocTypeVersion to 4

The muxer has been creating files with v4 elements for some time now,
and especially now that we can mux non-experimental Opus files, reporting
the DocTypeVersion as 2 is not correct.

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

Adding a line to Changelog about FFV1 version 1.3 now being stable

FFV1 version 1.3 is non-experimental as of Aug 26, 2013. Adding that to the changelog.

Signed-Off By: dericed <dave@dericed.com>

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

avformat/nutenc: use av_reallocp_array()

Fixes memleak on allocation error.

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

avformat/nutenc: use av_calloc()

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

mem: Document the non-compatibility of av_realloc() and av_malloc()

avcodec/bfi: check for malloc failure

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

avcodec/mationpixels: free memory after malloc failures

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

avfilter/avf_avectorscope: improve description

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

avcodec/cdxl: use av_freep()

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

avcodec/mationpixels: check for malloc failures

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

ffserver: allow choosing the pixel format

Fixes Ticket2954

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

avcodec/mpeg12dec: clear mpeg_enc_ctx_allocated when contexts are deallocated

Fixes Ticket2950

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

avcodec/mjpegdec: check for malloc failure of blocks[] and last_nnz[]

Fixes null pointer dereference
Fixes Ticket2947

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

avcodec/g2meet: remove redundant log message

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

avcodec/proresdec2: remove duplicated tables

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

avfilter/video: remove commented out cruft

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

avutil/pixdesc: dont try to use av_read_image_line() with bayer formats

It has undefined behavior ATM as its not supported.

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

avutil/pixdesc: Prevent minor array overread in ff_check_pixfmt_descriptors()

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  pcm-dvd: Minor leftovers

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

Merge commit 'd9cdb7d8d6d828bb5497ea3f0fd7edd2f3f6cc30'

* commit 'd9cdb7d8d6d828bb5497ea3f0fd7edd2f3f6cc30':
  pcm-dvd: Support channel configuration changes

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

pcm-dvd: Minor leftovers

Drop a pointless branch in uninit and use the compact copyright.

pcm-dvd: Support channel configuration changes

The sample buffering logic does not take into account that the blocksize
could change. Reset the buffer if the channel configuration changes,
since if there are leftover samples, it is most likely a broken or
misconcatenated stream. This could lead to negative numbers for
missing_samples during decoding.

Thanks to Michael Niedermeyer for pointing these out.

avfilter/vf_noise: rename linesize to bytewidth

Its the width in bytes and not the linesize or stride.
This makes the naming more consistent with the rest of the codebase

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

Revert "avfilter/vf_noise: dont corrupt the picture outside width x height"

This reverts commit 51dab60c7b91a21ec280c7d3042aa8350aae048f.

this fixed nothing, and was just the result of assuming that the
variable named linesize was the linesize. Its not, its the width
in bytes which was already correct.

Found-by: durandal_1707

avfilter/vidstabtransform: allow negative zoom.

This is useful in addition to crop=black.

Signed-off-by: Clément Bœsch <clement@stupeflix.com>

lavf/matroska: Removing experimental suffix for Opus

Removing the /EXPERIMENTAL suffix for codec id field for Opus. Doing this
as the implementation of embedding Opus in Matroska is complete.

Signed-Off By: Vignesh Venkatasubramanian <vigneshv@google.com>

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

Adding a line to Changelog about Opus Matroska Support

Next release of ffmpeg will support embedding Opus in Matroska
container. Adding that to the Changelog.

Signed-Off By: Vignesh Venkatasubramanian <vigneshv@google.com>

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

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Set bits_per_raw_sample when reading j2k frames.
  libopenjpegdec.c: Correctly scale gray16 output if precision < 16
  Use rc_max_rate if no video bit_rate was specified when muxing mxf_d10.
  Store the video bit_rate in the context when muxing mxf.

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

avcodec/smacker: use init_get_bits8()

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

avcodec/aacenc: use enum for aac coder.

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

aacenc: use constants to set AAC coder

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

aacenc: add AAC_CODER_(FAAC|ANMR|etc.) macros

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/aic: fix "warning: comparison of unsigned expression < 0 is always false"

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

avfilter/vf_noise: dont corrupt the picture outside width x height

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

avfilter/vf_noise: unbreak filter when inline assembly is not present

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

avcodec/smacker: fix some memleaks

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

avcodec/smacker: remove check that has become redundant

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

avcodec/smacker: use the correct field instead of a hardcoded value for the index check in smacker_decode_tree()

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

vformat/smacker: use av_freep() to ensure no stale pointers remain

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

avfilter: various cosmetics

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  matroskaenc: Fix stray pointers left over from av_reallocp_array refactoring

Conflicts:
libavformat/matroskaenc.c

Mostly not merged as the buggy code was no longer part of FFmpeg

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

MAINTAINERS: move sections from lavc to lavu

Reflect current code organization.

Merge commit 'c0779a67e85df856904ee6fab760c4233d4c2be5'

* commit 'c0779a67e85df856904ee6fab760c4233d4c2be5':
  mp3: add .mpa extension

Conflicts:
libavformat/mp3dec.c

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

Merge commit 'e2cd766ca1b9bb2ba72aca5f6ba5d8be15743984'

* commit 'e2cd766ca1b9bb2ba72aca5f6ba5d8be15743984':
  configure: Mention that icl does not build both static and shared libs

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

Merge commit 'b1e469885362febce3d9a4678624e44a92f77da9'

* commit 'b1e469885362febce3d9a4678624e44a92f77da9':
  g2meet: Allocate cursor buffers large enough to fit the aligned width

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

Merge commit '0f678c0214dccb355ed8955077a2bea46984fbc8'

* commit '0f678c0214dccb355ed8955077a2bea46984fbc8':
  aic: Validate values read from the bitstream

Conflicts:
libavcodec/aic.c

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

Merge commit '17d57848fc14e82f76a65ffb25c90f2f011dc4a0'

* commit '17d57848fc14e82f76a65ffb25c90f2f011dc4a0':
  mpc8: Make sure the first stream exists before parsing the seek table

Conflicts:
libavformat/mpc8.c

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

Merge commit '459f2b393a3f89ed08d10fbceb4738d1429f268e'

* commit '459f2b393a3f89ed08d10fbceb4738d1429f268e':
  mpc8: Check the seek table size parsed from the bitstream

Conflicts:
libavformat/mpc8.c

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

Merge commit '0d61f260010707f3028b818e8b24598e1a83d696'

* commit '0d61f260010707f3028b818e8b24598e1a83d696':
  zmbvdec: Check the buffer size for uncompressed data

Conflicts:
libavcodec/zmbv.c

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

Merge commit '183b9d843a9533774fabd3984a52f3987001acbc'

* commit '183b9d843a9533774fabd3984a52f3987001acbc':
  ape: Don't allow the seektable to be omitted

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

Merge commit 'b26742cc308552f242ee2bf93b07a3ff509f4edc'

* commit 'b26742cc308552f242ee2bf93b07a3ff509f4edc':
  shorten: Break out of loop looking for fmt chunk if none is found

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

Merge commit '49568851bf1700e3d9ea9cda29208d0df3c2c38b'

* commit '49568851bf1700e3d9ea9cda29208d0df3c2c38b':
  shorten: Use a checked bytestream reader for the wave header

Conflicts:
libavcodec/shorten.c

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

matroskaenc: Fix stray pointers left over from av_reallocp_array refactoring

Signed-off-by: Diego Biurrun <diego@biurrun.de>

mp3: add .mpa extension

Signed-off-by: Diego Biurrun <diego@biurrun.de>

configure: Mention that icl does not build both static and shared libs

Merge commit 'f3d57dc69145f1b7acb4870da9ce60378190a1fd'

* commit 'f3d57dc69145f1b7acb4870da9ce60378190a1fd':
  smacker: Free memory properly if the init function fails

Conflicts:
libavcodec/smacker.c

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

Merge commit '0679cec6e8802643bbe6d5f68ca1110a7d3171da'

* commit '0679cec6e8802643bbe6d5f68ca1110a7d3171da':
  smacker: Make sure we don't fill in huffman codes out of range

Conflicts:
libavcodec/smacker.c

See: 1285baaab550e3e761590ef6dfb1d9bd9d1332e4
the added test is redundant but will be used after future refactoring

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

Merge commit 'd002fce24a7206e95f9492031f45adc35711e183'

* commit 'd002fce24a7206e95f9492031f45adc35711e183':
  smacker: Check malloc return values

Conflicts:
libavcodec/smacker.c

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

Merge commit '710b0e27025948b7511821c2f888ff2d74a59e14'

* commit '710b0e27025948b7511821c2f888ff2d74a59e14':
  smacker: Avoid integer overflow when allocating packets

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