Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpegvideo_enc: fix indentation in load_input_picture()

Conflicts:
libavcodec/mpegvideo_enc.c

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

Merge commit '3f47d316cda9037024ffbc76f789332e62b729bc'

* commit '3f47d316cda9037024ffbc76f789332e62b729bc':
  mpegvideo_enc: do not modify the input frame.

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

Merge commit '7bcaeb408e3eb2d2f37a306009fa7fe7eb0f1d79'

* commit '7bcaeb408e3eb2d2f37a306009fa7fe7eb0f1d79':
  mjpegdec: fix indentation
  rawdec: cosmetics, reformat
  mimic: return meaningful error codes.

Conflicts:
libavcodec/mjpegdec.c
libavcodec/rawdec.c

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

Merge commit 'a0cabd0a27587525e90a44660c795d40d2f44fe2'

* commit 'a0cabd0a27587525e90a44660c795d40d2f44fe2':
  mimic: cosmetics, reformat
  iff: drop ff_ prefix from a static function.
  pngdec: cosmetics, reformat.
  dxa: return meaningful error codes.
  eatgq: cosmetics, reformat.

Conflicts:
libavcodec/dxa.c
libavcodec/eatgq.c
libavcodec/iff.c
libavcodec/mimic.c
libavcodec/pngdec.c

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

doc/texi2pod: fix warnings introduced in e7e14bc69a606a6bec82efef729263cd38f122d4

The variable "$section" was replaced by "$chapter".

remove av_strnstr from Changelog

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

Merge commit 'f337c29017b10c98ccb4dce20efced4c74b665f6'

* commit 'f337c29017b10c98ccb4dce20efced4c74b665f6':
  eatgq: return meaningful error codes.
  eatgv: cosmetics, reformat

Conflicts:
libavcodec/eatgq.c
libavcodec/eatgv.c

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

Merge commit 'ade402804a0e811cd00862c90559121a793054a6'

* commit 'ade402804a0e811cd00862c90559121a793054a6':
  eatgv: return meaningful error codes.
  cyuv: return meaningful error codes.
  txd: return meaningful error codes.

Conflicts:
libavcodec/cyuv.c
libavcodec/eatgv.c

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

Merge commit '69c25c9284645cf5189af2ede42d6f53828f3b45'

* commit '69c25c9284645cf5189af2ede42d6f53828f3b45':
  dnxhdenc: fix invalid reads in dnxhd_mb_var_thread().
  x86: h264qpel: Move stray comment to the right spot and clarify it
  atrac3: use correct loop variable in add_tonal_components()

Conflicts:
tests/ref/vsynth/vsynth1-dnxhd-1080i
tests/ref/vsynth/vsynth2-dnxhd-1080i

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

Merge commit 'ded3673d77943c376d94e8157b1238bbd1eeca2d'

* commit 'ded3673d77943c376d94e8157b1238bbd1eeca2d':
  doc: document libx264 options and mappings
  libx264: introduce -x264-params private option

Conflicts:
doc/encoders.texi

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

Merge commit '38c1466ca41c73c7ce347da702362cb69c151716'

* commit '38c1466ca41c73c7ce347da702362cb69c151716':
  dict: add av_dict_parse_string()
  doc: support multitable in texi2pod

Conflicts:
doc/APIchanges
libavutil/version.h

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

mpegvideo_enc: fix indentation in load_input_picture()

mpegvideo_enc: do not modify the input frame.

mjpegdec: fix indentation

rawdec: cosmetics, reformat

mimic: return meaningful error codes.

mimic: cosmetics, reformat

iff: drop ff_ prefix from a static function.

pngdec: cosmetics, reformat.

Also remove a commented out line.

dxa: return meaningful error codes.

eatgq: cosmetics, reformat.

lavc/iff: ilbm: unbreak decoding on big endian

Fixes #2192.

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

eatgq: return meaningful error codes.

eatgv: cosmetics, reformat

eatgv: return meaningful error codes.

cyuv: return meaningful error codes.

txd: return meaningful error codes.

lavfi/vf_drawtext: default to expansion=normal.

dnxhdenc: fix invalid reads in dnxhd_mb_var_thread().

Do not assume that frame dimensions are mod16 (or that height is mod32
for interlaced).

CC:libav-stable@libav.org

fate: add an attachment to the Matroska test.

lavfi: version bump and change log entries after the last commits.

x86: h264qpel: Move stray comment to the right spot and clarify it

ffmpeg: support filtering of unknown channel layouts.

lavfi/af_anull: accept unknown channel layouts.

lavfi/af_aresample: accept unknown channel layouts.

lavfi/af_aformat: accept unknown channel layouts.

lavfi/buffersrc: accept unknown channel layouts.

lavfi/sink_buffer: accept unknown channel layouts.

Add a field to the AVBufferSinkParams for a list of accepted
channel counts.
Change the default value for the lists in AVBufferSinkParams
to NULL, to let lavfi fill them with something useful.
The fail_enomem path is unneeded because filters are uninited
on failure.

lavfi: implement ff_query_formats_all().

lavfi: implement ff_all_channel_counts().

lavfi: support unknown channel layouts.

ffmpeg: add -guess_layout_max option.

lavc/gif: remove some obsolete/irrelevant chunks

Some code was copy pasted from muxer, which still
have same comments but unlike encoder they are still
relevant to muxer.

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

lavf/gifdec: cosmetics: remove extra whitespace

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

lavf/gifdec: fix typo

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

sws: GBRP9, GBRP10 GBRP12 GBRP14 output support

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

sws: GBRP output support

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

atrac3: fix buffer size for get_bits.

Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

indeo4: check for invalid transform_size blk_size combinations

The checks existing previously where not sufficient
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

4xm: remove avcodec_get_frame_defaults() calls

They are not needed anymore

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

4xm: add assert to check that the pointer from read_huffman_tables is within the array

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

4xm: Check available space in read_huffman_tables()

Fixes integer overflow and out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fix atrac3 decoder broken in e55d53905f34f8e8747f6d321e9a695dc02ebb2f

Signed-off-by: Michael Karcher <ffmpeg@mkarcher.dialup.fu-berlin.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ffv1enc: fix gbrp>8bit

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

atrac3: use correct loop variable in add_tonal_components()

Signed-off-by: Michael Karcher <ffmpeg@mkarcher.dialup.fu-berlin.de>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
CC:libav-stable@libav.org

lavfi/showwaves: fail in case of push_frame() error

doc/filters: apply minor fixes

lavfi/showwaves: add display mode option and mode=line

gifdec: resync support

This allows decoding gifs that have junk at the begin
and also allows byte wise seeking

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

doc: document libx264 options and mappings

dict: add av_dict_parse_string()

Can be used to set multiple key/value pairs from a string.

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

libx264: introduce -x264-params private option

It is a shortcut to set all the params using x264_param_parse,
makes simpler importing settings from other software using x264.

lavc/dnxhddata: fix bitrates for cid 1251 and 1252 in cid table

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

setpts: deprecate RTCTIME, we have time(0) which is more generic

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avfilter: allow setpts filter to use wallclock time for calculations

Conflicts:
doc/filters.texi

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

Merge commit 'b85a5e87af4254b80913fe33591d96361f30832b'

* commit 'b85a5e87af4254b80913fe33591d96361f30832b':
  lavu: Add av_strnstr()
  h264: Allow discarding the cropping information from SPS

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

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

Merge commit '33552a5f7b6ec7057516f487b1a902331f8c353e'

* commit '33552a5f7b6ec7057516f487b1a902331f8c353e':
  arm: Add mathops.h to ARCH_HEADERS list
  avstring: K&R formatting cosmetics

Conflicts:
libavutil/avstring.c

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

Merge commit '2c10e2a2f62477efaef5b641974594f7df4ca339'

* commit '2c10e2a2f62477efaef5b641974594f7df4ca339':
  build: Make the H.264 parser select h264qpel
  x86: h264qpel: add cpu flag checks for init function

Conflicts:
libavcodec/x86/h264_qpel.c

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

swscale: check flags instead of nb_components to find if pixel format have alpha

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

doc: support multitable in texi2pod

lavc/gifdec: remove obsolete check

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

lavc/gifdec: move idx_line allocation out of gif_read_header1()

Now allocation is done only if av_image_check_size() passes.

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

lavc/gifdec: do not return nonzero *got_frame if frame is not passed

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

lavc/gifdec: simplify "!= 0" checks

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

lavc/gifdec: use memcpy()

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

Merge commit '6bdb841b46d170d58488deaed720729b79223b1d'

* commit '6bdb841b46d170d58488deaed720729b79223b1d':
  arm: h264qpel: use neon h264 qpel functions only if supported

* bug was fixed previously (in merge of buggy code):
  h264: copy h264qpel dsp context to slice thread copies

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

avfilter: allow setpts filter to use wallclock time for calculations

Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

lavu: Add av_strnstr()

This is a length limited version of strstr()

Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

h264: Allow discarding the cropping information from SPS

Some 3D systems overload the meaning of the field for other purposes.

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

vqavideo: check chunk sizes before reading chunks

Fixes out of array writes

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

eacmv: Free frames on resolution changes

Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

gifdec: check that w,h is not zero

Fixes out of array access

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fix compilation with --disable-everything on x86_32.

Fixes ticket #2183.

ffmpeg: fix typo in open_files() message

Found-By: Justin Ruggles

lavf/img2enc: extend current options documentation

lavf/img2dec: fix option help fields

doc/faq: fill missing word in the concat protocol entry

doc/faq: mention concat protocol documentation in the protocol concatenation entry

gifdec: gif_copy_img_rect: Fix end pointer

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

h264_qpel: put cpuflags checks back.

These where lost when libav moved the code out of dsputil

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

cavsdec: check for value in get_ue_code()

Fixes integer overflow and prints an error in case the value is
invalid.

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

lavu/timecode: fix time code calculation for 60000/1001 drop frame

Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavu/timecode: Allow drop frame mode for 60000/1001 fps

Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

arm: Add mathops.h to ARCH_HEADERS list

It is an arch-specific header not suitable for standalone compilation.

avstring: K&R formatting cosmetics

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

build: Make the H.264 parser select h264qpel

It is required for building the shared H.264 code.

x86: h264qpel: add cpu flag checks for init function

The code was copied from per cpu extension init function so the checks
for supported extensions was overlooked.

movenc: check that fps for tmcd is within encodable range.

The fps is stored as a 8 bit value thus 255 is the maximum encodable.

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

movenc: Calculate fps for tmcd without intermediate step.

Fixes part of Ticket2045

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

ffmpeg: copy tmcd track timebase parameters

Fixes part of Ticket2045

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