avformat/vocdec: return AVERROR_EOF when EOF is reached

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

doc/developer: Merge license related policy items

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  indeo4: Check the inherited quant_mat

Conflicts:
libavcodec/indeo4.c

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

Merge commit '0cb83c563848bf8f8365e7bd30e7e6b57ef360f0'

* commit '0cb83c563848bf8f8365e7bd30e7e6b57ef360f0':
  indeo4: Check the block size if reusing the band configuration

Conflicts:
libavcodec/indeo4.c

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

Merge commit 'fd2384f02b905a106fba9222ece4ddbe2ec61937'

* commit 'fd2384f02b905a106fba9222ece4ddbe2ec61937':
  oggparsevorbis: fail on memory allocation error

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

Merge commit 'c18375ec8040a9fe0f186b2033dc975883143758'

* commit 'c18375ec8040a9fe0f186b2033dc975883143758':
  oggvorbisdec: add support for embedded cover art

Conflicts:
libavformat/oggparsevorbis.c

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

Merge commit '601d6228c4811d8971a2412a759e1a4ab775ebe8'

* commit '601d6228c4811d8971a2412a759e1a4ab775ebe8':
  flac: move picture parsing code in a separate file

Conflicts:
libavformat/Makefile
libavformat/flacdec.c

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

Merge commit 'ecab1c77410f023b437c6ed3a3281be8f039e574'

* commit 'ecab1c77410f023b437c6ed3a3281be8f039e574':
  oggdec: add support for Opus in Ogg demuxing

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

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

Merge commit 'ed9245dba83f9add60f55718b537b0af2105c60e'

* commit 'ed9245dba83f9add60f55718b537b0af2105c60e':
  oggparsevorbis: check allocations

Conflicts:
libavformat/oggparsevorbis.c

See: 033f1644b59abd755bb529afa5db394d18d9c30b
See: 84aea80f7824c23b4cbf101f03e2b5b418a79d80
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '9c15ef35d404fca2adc31276c1eedb11cf485461'

* commit '9c15ef35d404fca2adc31276c1eedb11cf485461':
  oggparsevorbis: support official chapter extension

Conflicts:
libavformat/oggparsevorbis.c

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

Merge commit '16ea20c827ef2ffaf77d5e05d5cf9983689f7b2b'

* commit '16ea20c827ef2ffaf77d5e05d5cf9983689f7b2b':
  lavc doxy: extend/clarify avcodec_decode_audio4() doxy

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

Merge commit '66d3f5fd5ca4cb3d09b52ad1041cd4359325a21a'

* commit '66d3f5fd5ca4cb3d09b52ad1041cd4359325a21a':
  lavc doxy: remove false statements about alignment requirements.

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

Merge commit '364af376f343d4706c4cdb7ab9fe0863994e6c01'

* commit '364af376f343d4706c4cdb7ab9fe0863994e6c01':
  FATE: add lavr resampling tests

The tests do not pass, and thus where disabled

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

Merge commit '9ab5f7107d2f1411e9fda6c36af64524e5ed31d1'

* commit '9ab5f7107d2f1411e9fda6c36af64524e5ed31d1':
  FATE: add lavr mixing tests

The tests do not pass, and thus where disabled

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

Merge commit 'df6737a55f5dc7c0ae5272bc5fa6182836d5481c'

* commit 'df6737a55f5dc7c0ae5272bc5fa6182836d5481c':
  audio_mix: fix channel order in mix_1_to_2_fltp_flt_c

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

indeo4: Check the inherited quant_mat

Invalidate it if not supported.

Sample-Id: 00000262-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

indeo4: Check the block size if reusing the band configuration

Sample-Id: 00000287-google

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

lavc: rename h265 to hevc, add AV_CODEC_ID_H265 with identical value for backward compatibility

Somehow 2 different identifiers have come into existence which makes supporting
both until the next major version bump required
I did not investigate how exactly that did happen.

wm4, j-b and smarter prefer hevc.

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

avformat/avr: use ff_get_pcm_codec_id()

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

avfilter/vsrc_testsrc: smpte(hd)bars: use yuv directly

Also set color space.

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

avfilter/vf_separatefields: do not reset pts to 0

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

oggparsevorbis: fail on memory allocation error

oggvorbisdec: add support for embedded cover art

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

flac: move picture parsing code in a separate file

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>

oggdec: add support for Opus in Ogg demuxing

oggparsevorbis: check allocations

Signed-off-by: Anton Khirnov <anton@khirnov.net>

oggparsevorbis: support official chapter extension

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>

lavc doxy: extend/clarify avcodec_decode_audio4() doxy

Elaborate on flushing the decoder.

lavc doxy: remove false statements about alignment requirements.

The packet data does not need to be aligned.

FATE: add lavr resampling tests

FATE: add lavr mixing tests

audio_mix: fix channel order in mix_1_to_2_fltp_flt_c

CC:libav-stable@libav.org

Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  avformat/ftp: add log regarding passive mode failure
  avformat/ftp: fix possible deadlock
  avdevice/pulse_audio_enc: fix stream index

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  riff: Add a mapping for VP6A

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

avformat/ftp: add log regarding passive mode failure

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

avformat/ftp: fix possible deadlock

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

avdevice/pulse_audio_enc: fix stream index

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

riff: Add a mapping for VP6A

This allows demuxing VP6A from F4V files.

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

avfilter/lavfutils: fix memleak of avpacket

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

avfilter/vf_removelogo: fix pixel pointer so it points where its intended

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

avfilter/vf_removelogo: fix offset for accessing pixels above and below

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

avfilter/vf_removelogo: use av_freep() for saftey

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

avformat/movenc: set XDCAM codec tag correctly

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

avformat/movenc: set pretty compressor name for XDCAM

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

avformat/movenc: make AVStream easier to access

This adds a AVStream pointer to Track

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

doc/codecs: Add missing mpeg2 aac profiles

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

doc/codecs: Add ignorecrop

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

doc/codecs: Remove no longer existing options

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

doc/codecs: Cosmetics in the flags2 description

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

doc/codecs: document skip_alpha

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  prores: Reject negative run and level values

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

doc/filters/scale: do not explicitly state the default swscale flags value

This is done is order to avoid the need of synching scale with libswscale
docs in case the libswscale default changes.

lavf/riff.c: Fix GeoVision H.264 fourcc.

Fixes d24da748

Add H.264 fourcc GAVC for GeoVision cameras.

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mxf: Add jpeg2000 codec to intra only codecs

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

Merge commit '5f5ada3dbf97e306a74250ba8dcf8619ad59b020'

* commit '5f5ada3dbf97e306a74250ba8dcf8619ad59b020':
  shorten: Fix out-of-array read

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

Merge commit 'ed796fba761f4794bec7735d467c1b2c8e1858fe'

* commit 'ed796fba761f4794bec7735d467c1b2c8e1858fe':
  atrac3: Better name for IMDCT window initialization
  atrac3: Remove unused gain compensation tables

See: 2d52834910a4a043d150fc3fce9a06372d5aa108
See: 4fb8de08e1107db9a42fd4e6e4a72a8ebc5439fa
Merged-by: Michael Niedermayer <michaelni@gmx.at>

ffmpeg: set the source_index for trivial filter graphs

Fixes one testcase in Ticket2969

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

prores: Reject negative run and level values

Sample-Id: 00000611-google

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

avcodec/exr: remove pointless initialization

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

atrac3: Better name for imdct window initialization

Patch by Diego Biurrun.

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

atrac3: Remove unused gain compensation tables

Patch by Diego Biurrun.

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

mxf: Add jpeg2000 codec to intra only codecs

Conform with SMPTE RP 224 and SMPTE s422.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

shorten: Fix out-of-array read

pred_order == FF_ARRAY_ELEMS(fixed_coeffs) is invalid too.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

swscale: Use full resolution chroma for yuv2rgb when the input has full chroma

See Ticket3028

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

avfilter/vf_w3fdif: do not reset pts to 0

Shamelessly stolen from yadif.

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

doc/codecs: Document field_order

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

atrac3: Better name for IMDCT window initialization

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

atrac3: Remove unused gain compensation tables

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

doc/encoder/aac: Remove -cutoff trick

Fix Ticket #2686 comment 155.

Trick obsoleted since 72dabdfc58064fcb249f26fc7afca2221f18a832.

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

libavcodec/x86: Fix emulated_edge_mc SSE code to not contain SSE2 instructions on x86-32.

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

avcodec/proresdec2: propagate error codes

Based-on: 44690dfa683f620c77e9f0e8e9bc5682608636b1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/vmnc/reset_buffers(): reset cur_hx/hy too for saftey

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  prores: Error out only on surely incomplete ac_coeffs

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

Merge commit '44690dfa683f620c77e9f0e8e9bc5682608636b1'

* commit '44690dfa683f620c77e9f0e8e9bc5682608636b1':
  prores: Add a codepath for decoding errors

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

Merge commit 'e6ed8668597cfea25dfb350a9b4df7fb2efc1d90'

* commit 'e6ed8668597cfea25dfb350a9b4df7fb2efc1d90':
  flvenc: Write proper cropping for VP6 even if there's no extradata

Conflicts:
libavformat/flvenc.c

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

Merge commit 'be1e1373d267bae2af8a62d79eef736736f24565'

* commit 'be1e1373d267bae2af8a62d79eef736736f24565':
  flvenc: Support muxing VP6A as well

Conflicts:
libavformat/flvenc.c

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

Merge commit '4d7aeff9a1080e64125f3374d993b2c9c4c2751b'

* commit '4d7aeff9a1080e64125f3374d993b2c9c4c2751b':
  flvenc: Don't pretend to support muxing "plain" VP6

Conflicts:
libavformat/flvenc.c

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

Merge commit '41a10f3ba149a2012de499d0b4ad4955d81f28d5'

* commit '41a10f3ba149a2012de499d0b4ad4955d81f28d5':
  vp6: Support cropping to AVCodecContext.width/height

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

Merge commit 'ceec6e792e4b5baaa23b220f4fd33417631f5288'

* commit 'ceec6e792e4b5baaa23b220f4fd33417631f5288':
  avi: directly resync on DV in AVI read failure

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

Merge commit '756547ce7f4d67a18663503e2157aebed3531703'

* commit '756547ce7f4d67a18663503e2157aebed3531703':
  avi: DV in AVI must be considered single stream

Conflicts:
libavformat/avidec.c

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

Merge commit '1cac9accbd1f9b8596122d0735e37b97a844c514'

* commit '1cac9accbd1f9b8596122d0735e37b97a844c514':
  avi: properly fail if the dv demuxer is missing

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

Merge commit '1018a92219a38a812cf97761c6b3a5e66a400f4b'

* commit '1018a92219a38a812cf97761c6b3a5e66a400f4b':
  jpeg2000: Check block length

See: 914ab4cd1c59eae10771f2d6a892ec6b6f36b0e2
See: 582f53349eabd75164d4389503eb95048982cfdc
Merged-by: Michael Niedermayer <michaelni@gmx.at>

prores: Error out only on surely incomplete ac_coeffs

prores: Add a codepath for decoding errors

Merge commit '071e29af4d383bdb44d0c87416dee3e4bb597936'

* commit '071e29af4d383bdb44d0c87416dee3e4bb597936':
  vmnc: Use meaningful return values

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

flvenc: Write proper cropping for VP6 even if there's no extradata

This keeps cropping when remuxing from F4V to FLV.

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

flvenc: Support muxing VP6A as well

Handle it in the same way as VP6F, except for the codec tag.

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

flvenc: Don't pretend to support muxing "plain" VP6

The plain VP6 format is vertically flipped compared to VP6F/VP6A.
Support for the plain VP6 format was added in 09d8c0ae831 (which
also introduced support for muxing VP6F properly in general).

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

vp6: Support cropping to AVCodecContext.width/height

In these cases, there is no extradata but only the properly set
width/height values by the demuxer.

This makes sure VP6 in F4V files is cropped properly.

This is similar to what is done for H264 for letting the container
width/height override what's in the bitstream, since 30f515091.

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

Merge commit '5e992a4682d2c09eed3839c6cacf70db3b65c2f4'

* commit '5e992a4682d2c09eed3839c6cacf70db3b65c2f4':
  vmnc: Check the cursor dimensions

Conflicts:
libavcodec/vmnc.c

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

Merge commit '61cd19b8bc32185c8caf64d89d1b0909877a0707'

* commit '61cd19b8bc32185c8caf64d89d1b0909877a0707':
  vmnc: Port to bytestream2

Conflicts:
libavcodec/vmnc.c

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

Merge commit 'a66aa0daf290ef157cb3322b034b43d6201c43e9'

* commit 'a66aa0daf290ef157cb3322b034b43d6201c43e9':
  vmnc: K&R formatting cosmetics

Conflicts:
libavcodec/vmnc.c

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

avi: directly resync on DV in AVI read failure

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

avi: DV in AVI must be considered single stream

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

avi: properly fail if the dv demuxer is missing

CC: libav-stable@libav.org

avcodec/h264: call flush_change() on init

This ensures that all the non zero fields get setup correctly.
Alternatively their initialization could be duplicated.

Fixes Ticket2738

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

avcodec/h264_refs: modify key frame detection heuristic to detect more cases

Fixes Ticket2968

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

jpeg2000: Check block length

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

vmnc: Use meaningful return values