Merge commit '8b573ddda75980f724f779ff75aacc2ff81d9e0e'

* commit '8b573ddda75980f724f779ff75aacc2ff81d9e0e':
  hevc: remove superfluous assignments and checks

Conflicts:
libavcodec/hevc.c

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

Merge commit 'eac3ac1fe0774b65316852616b2672702dbc3f31'

* commit 'eac3ac1fe0774b65316852616b2672702dbc3f31':
  hevc: eliminate an unneeded intermediate variable

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

Merge commit 'eb335f3c5ce37f2b93c993e28404d113bee843bc'

* commit 'eb335f3c5ce37f2b93c993e28404d113bee843bc':
  hevc: reduce variable scope

Conflicts:
libavcodec/hevc.c

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

Merge commit '84c0ece5fd9569c0f31804f02a199ecd0e7d13d8'

* commit '84c0ece5fd9569c0f31804f02a199ecd0e7d13d8':
  hevc: further reduce code duplication in hls_prediction_unit()

Conflicts:
libavcodec/hevc.c

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

Merge commit 'a7b365ae191f45a0d7ed7b34033d5d0cbdd47139'

* commit 'a7b365ae191f45a0d7ed7b34033d5d0cbdd47139':
  hevc: reduce code duplication in hls_prediction_unit()

Conflicts:
libavcodec/hevc.c

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

Merge commit 'de1f8ead8993512925a3ee6c7491473414419e55'

* commit 'de1f8ead8993512925a3ee6c7491473414419e55':
  hevcdsp_template: templatize transquant_bypass

Conflicts:
libavcodec/hevcdsp_template.c

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

Merge commit '16c01fb4347312b6d29a6498dad627665b96a20e'

* commit '16c01fb4347312b6d29a6498dad627665b96a20e':
  hevc: remove an unused function parameter

Conflicts:
libavcodec/hevc.c

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

Merge commit '84b9463984083f4e83948c73c1a5dbaf596ff3f7'

* commit '84b9463984083f4e83948c73c1a5dbaf596ff3f7':
  hevc: remove a redundant line

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

Merge commit '2c6a7f9348378f887066fb1669c46b9485e8ef3e'

* commit '2c6a7f9348378f887066fb1669c46b9485e8ef3e':
  hevc: do not store rqt_root_cbf in the context

Conflicts:
libavcodec/hevc.c

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

Merge commit '920bca3e2332dced9c78bd14cfc2ff138188bd57'

* commit '920bca3e2332dced9c78bd14cfc2ff138188bd57':
  hevc: do not store pcm_flag in the context

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

hevc: remove superfluous assignments and checks

hevc: eliminate an unneeded intermediate variable

hevc: reduce variable scope

Also, collapse the array into a scalar, since only one value is needed
at a time.

hevc: further reduce code duplication in hls_prediction_unit()

hevc: reduce code duplication in hls_prediction_unit()

hevcdsp_template: templatize transquant_bypass

hevc: remove an unused function parameter

hevc: remove a redundant line

pred_mode is overwritten a few lines immediately below.

hevc: do not store rqt_root_cbf in the context

It does not need to be accessed outside of hls_coding_unit().

hevc: do not store pcm_flag in the context

It does not need to be accessed outside of hls_coding_unit().

ffmpeg: Fix last newline at log level less than "info"

Fixes Ticket3058

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

cmdutils: Exit in case of faulty stream specifiers

Avoids printing confusing and unrelated errors
Fixes Ticket2772

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

ffserver_config: fix possible crash

Fixes CID #1254662

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

ffserver_config: do not store preset name

Preset are translated to AVOptions.
It is not required to reparse anymore.

Fixes CID #1254667

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

ffserver: drop pointless explicit !=0 checks

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

avcodec/roqvideoenc: clear freed pointers

Avoid leaving stale pointers in memory

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

avcodec/snow: clear freed pointers

Avoid leaving stale pointers in memory

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

avcodec/rl2: clear freed pointers

Avoid leaving stale pointers in memory

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

avformat/mpeg: fix memleak of sub_name on error

Fixes CID1254666

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

avdevice/xcbgrab: Fix/remove unneeded NULL checks

Fixes CID1254664

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

avcodec/vorbis_parser: Move vp check

Fixes null pointer dereference
Fixes CID1251347

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

avcodec/dvdsubdec: Check all fseek()s return codes

Fixes CID1254660

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

avformat/hlsenc: Free context after hls_append_segment

Fixes reading uninitialized memory

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

avformat/segment: export inner muxer timebase

Fixes "Non-monotonous DTS in output stream 0:0"
Fixes Ticket4020

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

lavf/ffmdec: reident after last commit

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

lavf/ffm: use AVOption API to store/restore stream properties

This is a generic solution that will not reqiore modifications when new options are added.
This also fixes problem with current implementation when qmin or qmax=-1.
Only 8 bits was sent and read back as 255.

Fixes #1275
Fixes #1461

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

ffserver_config: handle codec private options

This commit allows to set codec's private option.
As side effect, it also improves preset support.

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

ffmpeg_opt: use codec private context in ffserver streams

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

lavf/ffm: store/restore private codec context

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

lavu/opt: introduce av_opt_serialize()

Function allows to create string containing object's serialized options.
Such string may be passed back to av_set_options_string() in order to restore options.

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

lavu/opt: introduce av_opt_is_set_to_default()

New function allows to check if option is set to its default value

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

lavc/options: initialize pkt_timebase

It's default in option_table.h is 0, but without this fix it is represented as 0/0.

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

lavc/options: set timecode_frame_start to -1 as option default

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

lavc/options_table: add pixel_format and video_size options

Adding these options simplify ffm format implementation based on AVOption API.

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

lavc/options_table: set min to -1 for timecode_frame_start

timecode_frame_start is set to -1 in avcodec_get_context_defaults3()
AVOptions API complains about it.

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

avfilter/vf_tinterlace: remove unused variable

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

Merge commit 'c00365b46d464ce47716315c1801818d811bdb9a'

* commit 'c00365b46d464ce47716315c1801818d811bdb9a':
  aarch64: Make the function pointer tables position independent

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

aarch64: Make the function pointer tables position independent

This allows running the code on android, where 64 bit binaries with
text relocations aren't allowed to be loaded.

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

avfilter/xbr: fix style in FILT4() calls

avfilter/xbr: clarify default "interpolated" pixels assignments

avfilter/xbr: refactor xbr[234]x into a single function

No speed difference.

avfilter/xbr: add slice threading

avcodec/nellymoserenc: update comment to match 5c805d69a49a1f32a7a8a1b16fb3d631d85ca56d

Found-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avfilter/xbr: add video and filtering flags to options

Fixes ffmpeg -h filter=xbr

avfilter/xbr: use function pointers for xbr[234]x

avfilter/xbr: remove FATE test entry from @todo

See 57688aecbd720f4b02acc65b5006b14b7dd6a9f4

avfilter/xbr: consistent copyright header

avfilter/xbr: make xbr[234]x a bit more consistent

avfilter/xbr: misc style fixes

avfilter/xbr: simplify left/up conditions

avfilter/xbr: misc cleanup in FILT[234] macros

avfilter/xbr: refactor src/dst pointers definitions into a macro

avfilter/xbr: refactor the 21 pixels definition into a macro

avfilter/xbr: mark source pointers as const

avfilter/xbr: simplify width overread checks

avfilter/xbr: use different macro names for each dimension

avfilter/xbr: avoid unecessary macro redirections

avfilter/xbr: localize some filtering variables

avfilter/xbr: do not pass unchanging r2y to macros

lavfi/xbr: remove relicensing notice from copyright header

The log is good enough for tracking those changes.

Merge commit '2fa6d21124bd2fc0b186290f5313179263bfcfb7'

* commit '2fa6d21124bd2fc0b186290f5313179263bfcfb7':
  on2avc: Fix out of array access

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

Merge commit '74d7db586a2e9aeb107e357739c7e4dde0b6991c'

* commit '74d7db586a2e9aeb107e357739c7e4dde0b6991c':
  dv: Drop a spurious check

Conflicts:
libavcodec/dvdec.c

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

lavfi : change xBR filter to LGPL

Hyllian's message : "Hi, Put lgpl on this and use it as you wish. It's free!"

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

avcodec/mpeg4video_parser: fix spurious extradata parse warnings

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

avcodec/mpeg4videodec: replace some return -1 by more specific error codes

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

avcodec/mpeg4videodec: forward return code in ff_mpeg4_decode_picture_header()

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

avformat/http: simplify chained_options copying

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

Fix the timeout option not working when connecting to a HTTP url that requires authentication.

In http_open_cnx, the patch restores the AVDictionary if connection needs to be re-tried
because of a authentication/redirect status code.

Previously, if a 401/407/30x status code was encountered, http_open_cnx would restart at the redo label, but any options
used by the underlying protocol would be missing because they were removed by the first attempt.

Signed-off-by: Brandon Lees <brandon@n-hega.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/dvdsubdec: New option for obtaining global palette from .IFO file (experimental)

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

on2avc: Fix out of array access

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

dv: Drop a spurious check

The buffer is always valid.

Bug-Id: CID 700682

mov.c: fix handling of seek return in read_mfra

this would cause mfra to be ignored in files larger than 2G

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

Merge commit '8562c1483ba647f562e4c1df68a9231274b80e6b'

* commit '8562c1483ba647f562e4c1df68a9231274b80e6b':
  Icecast: Send content-type in all cases

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

Merge commit '3a6bb9735053c453f806ceab1d91124648d90aca'

* commit '3a6bb9735053c453f806ceab1d91124648d90aca':
  Icecast: Send 100-continue header if possible

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

Icecast: Send content-type in all cases

This is needed because Icecast since version 2.4.1 doesn't default
to audio/mpeg anymore. AVOption default not used here, since a later
check if -content_type is set is performed and would break.

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

Icecast: Send 100-continue header if possible

This allows for proper error reporting. Only do
this for non-legacy requests as only Icecast >2.4.0
will reply with a proper status.
Libav seems to accept both, 100 and 200 status codes, but
let's stay close to spec.

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

avfilter/x86/vf_interlace: rewrite asm

4775 decicycles -> 3688 decicycles

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

avfilter/tinterlace: add Support for ff_lowpass_line_avx() & ff_lowpass_line_sse2()

Based-on: 2e1704059ae8625beda2ffde847ad22c5ba416dc by Kieran Kunhya

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

avfilter/tinterlace: Move lowpass_line to a separate function and call it through a function pointer

This permits replacing it by a optimized implementation
Based-on / Idea-from: 2e1704059ae8625beda2ffde847ad22c5ba416dc by Kieran Kunhya

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

avfilter/tinterlace: split context definition into seperate header so it can be used by future optimizations

Idea from 2e1704059ae8625beda2ffde847ad22c5ba416dc from Kieran Kunhya

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

avfilter/vf_tinterlace: fix linesize vs. width

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

libavformat/mxfdec.c: refactored resolving timecode component

Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avfilter/vf_tinterlace: Fix output top field first flag for MODE_INTERLACEX2

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

Merge commit '2e1704059ae8625beda2ffde847ad22c5ba416dc'

* commit '2e1704059ae8625beda2ffde847ad22c5ba416dc':
  vf_interlace: Add SIMD for lowpass filter

Conflicts:
libavfilter/vf_interlace.c
libavfilter/x86/Makefile

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

Merge commit 'd16ec1b6db25bc348b0d4800c9a0c9b7070e3710'

* commit 'd16ec1b6db25bc348b0d4800c9a0c9b7070e3710':
  atrac3plus: always initialize refwaves

The initialization is not needed, the array is never read before
being written to. Its merged anyway for robustness in respect to
future changes

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

avcodec/lpc: remove unneeded {}

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

Merge commit '60e0ee7ca25bd3bea54043b0607efe4cd51acaf3'

* commit '60e0ee7ca25bd3bea54043b0607efe4cd51acaf3':
  lpc: always initialize ref and err

The initialization is not needed, its merged anyway as it might
help suppressing warnings and might make the code more robust against
future changes

See: c4a36b6f70f37e668874d134f955eb96e23853c9
See: 0dd99628ea15f1fe7121b8a983c0b1fe57660027
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '3a6ddfb8745e4b306a5637927fb057f630345e2f'

* commit '3a6ddfb8745e4b306a5637927fb057f630345e2f':
  exr: check return value

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

Merge commit 'e4cb6abb2f46910c72178e2f987a0198f0fd10b1'

* commit 'e4cb6abb2f46910c72178e2f987a0198f0fd10b1':
  bgmc: fix sizeof arguments

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

Merge commit '4b39cc1a093c239412ded522c4a899744e7f2008'

* commit '4b39cc1a093c239412ded522c4a899744e7f2008':
  riff: support ProRes in avi (APCN fourcc)

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