avformat/concatdec: avoid NULL dereference when failed to open file.

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '6996fd204a7f28b46a8c3c97bcf223998218c743'

* commit '6996fd204a7f28b46a8c3c97bcf223998218c743':
  libopenh264: Log debug messages to a non-null context

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

examples/filtering: extend comments about setting the filter graph endpoints

That part is a constant source of confusions for readers, this should
help clarify the apparently inverted logic.

lavfi: document assumptions about the input and output labels of a filter graph description

doc/filters: apply some updates to the Filtergraph syntax section

libopenh264: Log debug messages to a non-null context

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

Fix frame-alignment in PP7

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

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Add an ARES atom to extradata when encoding avui.

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

libavutil: Added twofish symmetric block cipher

Signed-off-by: Supraja Meedinti <supraja0493@gmail.com>
Reviewed-by: Giorgio Vazzana <mywing81@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Add an ARES atom to extradata when encoding avui.

Allows playback with QuickTime and the original codec.

Tested by Olaf Matthes, olaf matthes gmx de

Merge commit '61928b68dc28e080b8c8191afe5541123c682bbd'

* commit '61928b68dc28e080b8c8191afe5541123c682bbd':
  h264: Do not share rbsp_buffer across threads

Conflicts:
libavcodec/h264.c

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

avformat/aviobuf: Allow seeking to the end of the buffer for read only buffers

This undoes the effect of 3c18a7b18807de81566381a1bcbe9f6103c0296b for reading

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

Merge commit '3c18a7b18807de81566381a1bcbe9f6103c0296b'

* commit '3c18a7b18807de81566381a1bcbe9f6103c0296b':
  avio: Do not consider the end-of-buffer position valid

Conflicts:
libavformat/aviobuf.c

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

Merge commit '6a808f5ae17f1fcdbcfb18055872c12aef70ffff'

* commit '6a808f5ae17f1fcdbcfb18055872c12aef70ffff':
  libdc1394: Add support for MONO8 (gray) video mode

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

avformat/nsvdec: remove case which is no longer possible

Check of channels !=0 is right above.

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

avfilter/x86/vf_fspp: Fix loop condition for column_fidct()

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

avfilter/vf_fspp: check count before calling row_idct()

Fixes crash with odd widths

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

avfilter/vf_fspp: Fix frame-alignment in FSPP

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

h264: Do not share rbsp_buffer across threads

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

avio: Do not consider the end-of-buffer position valid

Trigger a refill if the seek action moves the pointer
at the end of the buffer.

Before this patch the read action following the seek would trigger
the refill, while write action would write outside the buffer.

In the Libav codebase few muxers seek forward outside of what
already has been written so it is quite unlikely to experience
the problem with the default buffer size.

CC: libav-stable@libav.org

libdc1394: Add support for MONO8 (gray) video mode

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

avfilter/vf_colorchannelmixer: use the name 's' for the pointer to the private context

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

avfilter/avf_avectorscope: use the name 's' for the pointer to the private context

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

avfilter/af_biquads: use the name 's' for the pointer to the private context

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

avfilter/vf_extractplanes: use the name 's' for the pointer to the private context

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

avfitler/vf_il: use the name 's' for the pointer to the private context

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

avfilter/vf_colorbalance: use the name 's' for the pointer to the private context

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

avfilter/vf_telecine: use the name 's' for the pointer to the private context

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

avutil/aes: Rename crypt()

This avoids a potential conflict with the equally named function from XOPEN
It also could reduce confusion in debugger backtraces

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

avcodec/h264_parser: Rename close()

This avoids a potential conflict with the equally named function for closing files
It also could reduce confusion in debugger backtraces

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

doc/fftools-common-opts: update/extend documentation for -opencl_bench option

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

avcodec/nvenc: Handle non-square pixel aspect ratios

Reviewed-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

tests/fate: added mxf tests for essencegroups and missing index

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

avformat/mxfdec: Fix cleanup in mxf_free_metadataset()

Fixes Ticket4256

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

avfilter/vf_mcdeint: avoid uninitilaized fields in AVPacket

This is also simpler

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

swresample_internal.h: Move struct declaration before first use.

It seems more logical and works with more restricted C compilers
like tinycc.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

Support BMP files that do not properly align lines.

Quite a few programs missed that detail of the spec
(including old versions of FFmpeg I believe) and when
we would otherwise fail anyway it seems worth a try
to use a simple byte-aligned stride instead.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

Merge commit '8805589b803fab5f362008306319336ac79a3fa7'

* commit '8805589b803fab5f362008306319336ac79a3fa7':
  libopencv: Rework error handling in parse_iplconvkernel()

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

Merge commit '607ad990d31e6be52980970e5ce8cd25ab3de812'

* commit '607ad990d31e6be52980970e5ce8cd25ab3de812':
  dvbsubdec: check memory allocations and propagate errors

Conflicts:
libavcodec/dvbsubdec.c

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

Merge commit 'e71149a7a5b10ed7baa5a06f47d0313c7bd8df52'

* commit 'e71149a7a5b10ed7baa5a06f47d0313c7bd8df52':
  nuv: validate image size

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

Merge commit '7c51d79ca7badfb370c410b8f44c9142b938e2e6'

* commit '7c51d79ca7badfb370c410b8f44c9142b938e2e6':
  nsvdec: validate channels and samplerate

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

Merge commit 'a536a4e4bc52d05f59869761337452fb1f1977f6'

* commit 'a536a4e4bc52d05f59869761337452fb1f1977f6':
  lavc: support extracting audio service type from side data

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

Merge commit '32125781487411ed3b1b28b32063d6cd4024d4fc'

* commit '32125781487411ed3b1b28b32063d6cd4024d4fc':
  mov: export audio service type as side data

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

Merge commit '4227e4fe7443733fb906f6fb6c265105e8269c74'

* commit '4227e4fe7443733fb906f6fb6c265105e8269c74':
  lavf: add a convenience function for adding side data to a stream

Conflicts:
libavformat/internal.h
libavformat/replaygain.c

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

Merge commit '728685f37ab333ca35980bd01766c78d197f784a'

* commit '728685f37ab333ca35980bd01766c78d197f784a':
  Add a side data type for audio service type.

Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h
libavutil/frame.h
libavutil/version.h

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

Merge commit '80a11de7dca315505bf203ce9c8c016e71724fd2'

* commit '80a11de7dca315505bf203ce9c8c016e71724fd2':
  nutenc: do not use has_b_frames

Conflicts:
libavformat/nutenc.c
tests/ref/lavf/nut
tests/ref/seek/lavf-nut

Mostly not merged, this is simply not correct

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

Merge commit 'e44b58924fe7b180bf8b0c277c15d1a58210a0e9'

* commit 'e44b58924fe7b180bf8b0c277c15d1a58210a0e9':
  lavc: deprecate unused AVCodecContext.stream_codec_tag

Conflicts:
libavcodec/mpegvideo.c

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

avcodec/h263dec: Try to use codec_tag instead of the stream_codec_tag

If this causes problems then the stream_codec_tag should be enabled again

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

libopencv: Rework error handling in parse_iplconvkernel()

Fix 'values' memory leak in case of error.

CC: libav-stable@libav.org
Bug-Id: CID 739879

dvbsubdec: check memory allocations and propagate errors

nuv: validate image size

Avoid a division by zero.

CC: libav-stable@libav.org
Bug-Id: CID 717750

nsvdec: validate channels and samplerate

Avoid a division by zero.

CC: libav-stable@libav.org
Bug-Id: CID 717749

Merge commit 'f771b3ab5d3c0b763ee356152be550f4121babd0'

* commit 'f771b3ab5d3c0b763ee356152be550f4121babd0':
  avidec: do not export stream_codec_tag

Conflicts:
libavformat/avidec.c

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

Merge commit '167e004e1aca7765686ed95d7cd8ea5064d4f6f6'

* commit '167e004e1aca7765686ed95d7cd8ea5064d4f6f6':
  h264: drop any pretense of support for data partitioning

Conflicts:
libavcodec/h264.c

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

Merge commit '58ae8d595724150c407ca2c2df3aa4bd5580397c'

* commit '58ae8d595724150c407ca2c2df3aa4bd5580397c':
  h264_parser: restore a comment lost in 0268a54

Conflicts:
libavcodec/h264_parser.c

No change, the code that is commented is no longer there in the form to
which the comment applied

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

Merge commit 'ecab21ac47d0d4ca604bebf494017ae5090853a8'

* commit 'ecab21ac47d0d4ca604bebf494017ae5090853a8':
  h264: do not reset the ref lists in flush_change()

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

Merge commit '9404a47a2d1df418946a338938eb6cdb3afed474'

* commit '9404a47a2d1df418946a338938eb6cdb3afed474':
  h264: move parser-only variables to their own context

Conflicts:
libavcodec/h264_parser.c

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

Merge commit 'cf1e0786ed64e69614760bfb4ecd7adbde8e6094'

* commit 'cf1e0786ed64e69614760bfb4ecd7adbde8e6094':
  error_resilience: move the MECmpContext initialization into ER code

Conflicts:
libavcodec/error_resilience.c
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_slice.c

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

Merge commit 'a7e0380497306d9723dec8440a4c52e8bf0263cf'

* commit 'a7e0380497306d9723dec8440a4c52e8bf0263cf':
  avconv_dxva2: add hevc support

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

Merge commit '7e850fa67e32ebe98581c2e4ca4a4655dee7f116'

* commit '7e850fa67e32ebe98581c2e4ca4a4655dee7f116':
  Add DXVA2 HEVC HWAccel

Conflicts:
configure
libavcodec/allcodecs.c
libavcodec/dxva2_hevc.c

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

Merge commit 'b82722df9b2911bd41e0928db4804067b39e6528'

* commit 'b82722df9b2911bd41e0928db4804067b39e6528':
  hevc: reindent after previous commit

Conflicts:
libavcodec/hevc.c

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

Merge commit 'e72e8c5a1df61447ac7af750531e96e8b62d02ba'

* commit 'e72e8c5a1df61447ac7af750531e96e8b62d02ba':
  hevc: add hwaccel hooks

Conflicts:
libavcodec/hevc.c
libavcodec/hevc_refs.c

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

Merge commit '4b95e95dbae58c9b60891284bf8b5bbd83e5293a'

* commit '4b95e95dbae58c9b60891284bf8b5bbd83e5293a':
  hevc: store the short term rps flag and size in the context

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

Merge commit '36779a84051eae6744cc936d91b1d428143665ba'

* commit '36779a84051eae6744cc936d91b1d428143665ba':
  hevc: store the escaped/raw bitstream in HEVCNAL

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

Merge commit 'b0593a4bca138f1f026d8c21e8c3daa96800afe2'

* commit 'b0593a4bca138f1f026d8c21e8c3daa96800afe2':
  hevc: pass the full HEVCNAL struct to decode_nal_unit

Conflicts:
libavcodec/hevc.c

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

Merge commit '3a70c0c95feacb3844d05eebd579fc8189a77eee'

* commit '3a70c0c95feacb3844d05eebd579fc8189a77eee':
  examples/transcode_aac: generate proper PTS and set the muxer timebase

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

Merge commit 'c9b19ac8928c6c9b7f25c3988177204f110d5e0e'

* commit 'c9b19ac8928c6c9b7f25c3988177204f110d5e0e':
  examples/transcode_aac: fix a typo

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

Merge commit '749a89d1b8bb73b4d4f14c48f33259a1300c1761'

* commit '749a89d1b8bb73b4d4f14c48f33259a1300c1761':
  examples/transcode_aac: properly select the output sample format

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

Merge commit '443b71928b2f36362e805c037751e6c3c79ea4e8'

* commit '443b71928b2f36362e805c037751e6c3c79ea4e8':
  hevc: unref the current frame if frame_start() fails

Conflicts:
libavcodec/hevc.c

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

Merge commit '1dd021929f8157b88529ce1e6ab6351dd2899e89'

* commit '1dd021929f8157b88529ce1e6ab6351dd2899e89':
  hevc: clear unused refs on failure

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

Merge commit 'f9f883af4fe615a832407a657752e248a96c6280'

* commit 'f9f883af4fe615a832407a657752e248a96c6280':
  h264: simplify code in flush_dpb()

Conflicts:
libavcodec/h264.c

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

ffmpeg_dxva2: add hevc support

Reviewed-by: compn <tempn@mi.rr.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Add DXVA2 HEVC HWAccel

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

hevc: reindent after previous commit

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

hevc: add hwaccel hooks

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

hevc: store the short term rps flag and size in the context

For future use by hardware accelerators.

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

hevc: store the escaped/raw bitstream in HEVCNAL

Hardware Accelerators require access to the escaped bitstream.

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

lavfi/lut: apply minor compute_gammaval709() doxy fix

lavc: support extracting audio service type from side data

mov: export audio service type as side data

lavf: add a convenience function for adding side data to a stream

Add a side data type for audio service type.

Currently, audio service type is a field in AVCodecContext. However,
side data is more appropriate for this kind of information.

nutenc: do not use has_b_frames

It is unreliable, especially when the stream codec context is not the
encoding context. Use the codec descriptor properties instead.

lavc: deprecate unused AVCodecContext.stream_codec_tag

avidec: do not export stream_codec_tag

Handle its only existing use case internally.

h264: drop any pretense of support for data partitioning

It does not work correctly and apparently never did. There is no
indication that this (mis)feature is ever used in the wild or even that
any software other than the reference supports it.

Since the code that attempts to support it adds some nontrivial
complexity and has resulted in several bugs in the past, it is better to
just drop it.

h264_parser: restore a comment lost in 0268a54

h264: do not reset the ref lists in flush_change()

They are always constructed anew when needed, so there is no need to
reset them explicitly.

h264: move parser-only variables to their own context

error_resilience: move the MECmpContext initialization into ER code

Currently, it needs to be initialized by the ER caller (which is
currently either a mpegvideo decoder or h264dec). However, since none of
those decoders use MECmpContext for anything except ER, it makes more
sense to handle it purely inside ER.

avconv_dxva2: add hevc support

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

Add DXVA2 HEVC HWAccel

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

hevc: reindent after previous commit

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

hevc: add hwaccel hooks

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

hevc: store the short term rps flag and size in the context

For future use by hardware accelerators.

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

hevc: store the escaped/raw bitstream in HEVCNAL

Hardware Accelerators require access to the escaped bitstream.

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

hevc: pass the full HEVCNAL struct to decode_nal_unit

This enables decode_nal_unit to access additional fields added in
subsequent commits.

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

examples/transcode_aac: generate proper PTS and set the muxer timebase

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

examples/transcode_aac: fix a typo

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

examples/transcode_aac: properly select the output sample format

Makes the example work with all the supported AAC encoders.

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