Support YA16 in jpeg 2000.

avformat/oggenc: Simplify by using OFFSET and PARAM

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

Merge commit '60392480181f24ebf3ab48d8ac3614705de90152'

* commit '60392480181f24ebf3ab48d8ac3614705de90152':
  mem: fix pointer pointer aliasing violations

Conflicts:
libavutil/mem.c

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

Merge commit 'f726fc21ef76a8ba3445448066f7b2a687fbca16'

* commit 'f726fc21ef76a8ba3445448066f7b2a687fbca16':
  ogg: Provide an option to offset the serial number

Conflicts:
libavformat/oggenc.c

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

avcodec/motion_est: remove unneeded #include, there are no assert() only av_assert*

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

avcodec/put_bits:  remove unneeded #include, there are no assert()

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

mem: fix pointer pointer aliasing violations

This uses explicit memory copying to read and write pointer to pointers
of arbitrary object types. This works provided that the architecture
uses the same representation for all pointer types (the previous code
made that assumption already anyway).

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

ogg: Provide an option to offset the serial number

The ogg serial number doubles as codec id and sequence
value for concatenated samples.

dvenc: fix 2x4x8 (interlaced) weight table

Since the decoder has been fixed to output something similar to
other implementations, the encoder weight table needed this fix.

Reference PSNR values on a progressive sequence (from tiny_psnr)
from a chained encoding and decoding:
Full progressive: stddev:    0.74 PSNR: 50.69 MAXDIFF:   19
Before:           stddev:    1.43 PSNR: 44.97 MAXDIFF:   17
This patch:       stddev:    0.76 PSNR: 50.44 MAXDIFF:   14

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

examples/demuxing_decoding: set stream_idx in open_codec_context only if no error occured

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

avcodec/motion_est: Set subcmp consistently for H261

Fixes Ticket3150

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

avcodec/h261enc: More specific return code

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

avcodec/h261enc: Avoid casts, Simplify code

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

avformat/cache: pass options to the underlying protocol via the url_open2

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

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  lavc/arm: Use the neon vertical chroma loop filter also for H.264 4:2:2.
  lavc/aarch64: Do not use the neon horizontal chroma loop filter for H.264 4:2:2.

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

configure: remove mp_filter leftover

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

avfilter/avfilter: Remove CONFIG_MP_FILTER case

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

avfilter: remove vf_mp.c

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

remove libmpcodecs

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

doc/indevs/libcdio: apply minor spell fixes, extend documentation

lavd/libcdio: add more paranoia mode constants

lavd/libcdio: apply minor fixes to options documentation

lavc/arm: Use the neon vertical chroma loop filter also for H.264 4:2:2.

lavc/aarch64: Do not use the neon horizontal chroma loop filter for H.264 4:2:2.

avformat/movenc: remove unneeded #include, there are no assert() only av_assert*

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

avformat/mov: remove unneeded #include, there are no assert()

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

avformat/mux: remove unneeded #include, there are no assert() only av_assert*

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

avformat/asfenc: remove unneeded #include, there are no assert() only av_assert*

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

avformat/mpeg: remove unneeded #include, there are no assert() only av_assert*

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

avformat/utils: remove unneeded #include, there are no assert() only av_assert*

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

avcodec/vc1: remove unneeded #includes, there are no assert() only av_assert*

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

avcodec/svq1dec: remove unneeded #include, there are no assert()

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

avcodec/h261enc: fix dquant encoding

Fixes Ticket4111

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

libavcodec/h264: replace assert() by av_assert0()

also remove the now unneeded #include <assert.h>

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

avcodec/ratecontrol: replace asserts by av_asserts

Also remove the now unneeded #include <assert.h>

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

avcodec/vp3: use init_get_bits8()

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

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Respect horizontal differencing predictor for 16bit gray tiff images.

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

lavfi: remove mp=softpulldown

It is supposed to work correctly with MEncoder only.

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

avcodec/ppc/h264qpel_template: Change if DEBUG assert() to av_assert2()

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

ppc/mpegvideo_altivec: Change assert to av_assert2()

And move it to where the variable is used

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

avcodec/videodsp_template: remove unneeded #include, there are no assert() only av_assert*

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

avcodec/qdm2: remove unneeded #include, there are no assert()

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

ffmpeg: remove unused header

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

avformat/rtpdec_qdm2: change assert to av_assert0()

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

ffmpeg: free_input_threads requires HAVE_PTHREADS

Hide behind that macro to avoid warning on systems with
!HAVE_PTHREADS.

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

Respect horizontal differencing predictor for 16bit gray tiff images.

Fixes ticket #4291.

doc/muxers/segment: document strftime option

It was added in commit 202947a0665ea523022afb0a6c50eed96bcd6b69.

avformat/nut: support WavPack

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

avformat/nut: add GIF[0]

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

avcodec/aacdec: remove unneeded #include, theres no assert() in aacdec

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

avcodec/wma: remove unneeded #includes, there are no assert() only av_assert*

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

avcodec/hevc: Check for av_malloc failure

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

avcodec/hevc: Replace more mallocs by av_malloc_array()

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

avcodec/ccaption_dec: Adding color and fonts for future use in screen

Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

doc/indevs: add some XCB info to x11grab

Signed-off-by: Lou Logan <lou@lrcd.com>

Merge commit '22b985d59c007c4422aefe3ef3fca0aa0daafa9f'

* commit '22b985d59c007c4422aefe3ef3fca0aa0daafa9f':
  hqdn3d: check memory allocations and propagate errors

Conflicts:
libavfilter/vf_hqdn3d.c

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

Merge commit '70d246d5cc3d214da11f711d997d8cbd8c3a23d1'

* commit '70d246d5cc3d214da11f711d997d8cbd8c3a23d1':
  flacenc: initialize sums matrix

Conflicts:
libavcodec/flacenc.c

No change, the table does not exist in FFmpeg in this form anymore

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

Merge commit 'c01ccccbb13f464e74bb8498a8c573a66c430ca0'

* commit 'c01ccccbb13f464e74bb8498a8c573a66c430ca0':
  ituh263dec: use macro instead of #if

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

Merge commit '08fa34bf75942f66796d770ff42a3721b2e3d2d4'

* commit '08fa34bf75942f66796d770ff42a3721b2e3d2d4':
  yuv4mpegdec: initialize field_order in yuv4_read_header()

Conflicts:
libavformat/yuv4mpegdec.c

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

Merge commit '302ca6b20ed01ac584f5b15d5bca3d3a92b7a77a'

* commit '302ca6b20ed01ac584f5b15d5bca3d3a92b7a77a':
  mpegvideo_enc: initialize the encoding context

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

Merge commit '1a07df31128da3a0020b66502399989b91770d44'

* commit '1a07df31128da3a0020b66502399989b91770d44':
  DNxHD: Add support for id 1258 (DNx100 960x720@8)

Conflicts:
Changelog
libavcodec/dnxhddata.c

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

Merge commit '598f7d046cbf306706623210c5baafa3b7cd1df3'

* commit '598f7d046cbf306706623210c5baafa3b7cd1df3':
  DNxHD: Simplify pixel format detection

Conflicts:
libavcodec/dnxhddec.c

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

Merge commit '41e03e284ee7b0d4caa3a5d28681ad46e3105d65'

* commit '41e03e284ee7b0d4caa3a5d28681ad46e3105d65':
  DNxHD: More verbose error messages

Conflicts:
libavcodec/dnxhddec.c

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

Merge commit '1279221cc4d63bc4449df86ae7a98e633f8be425'

* commit '1279221cc4d63bc4449df86ae7a98e633f8be425':
  lavu: Check av_dict_set allocations

Conflicts:
libavutil/dict.c

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

hqdn3d: check memory allocations and propagate errors

flacenc: initialize sums matrix

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

ituh263dec: use macro instead of #if

yuv4mpegdec: initialize field_order in yuv4_read_header()

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

mpegvideo_enc: initialize the encoding context

This prevents several uninitialized variable uses that take
place towards the end of encoding.

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

DNxHD: Add support for id 1258 (DNx100 960x720@8)

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

DNxHD: Simplify pixel format detection

Error out in case of unknown values.

DNxHD: More verbose error messages

lavu: Check av_dict_set allocations

Bug-Id: CID 1257772
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

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>