Merge commit '342b0ba5f93b09b1d0c2597db44605300e6fcc53'

* commit '342b0ba5f93b09b1d0c2597db44605300e6fcc53':
  configure: Only redirect strtoll to _strtoi64 if necessary

Conflicts:
configure

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '5fd553d31272d5ed42a7a5a0ecaab7b3452da83a'

* commit '5fd553d31272d5ed42a7a5a0ecaab7b3452da83a':
  configure: Only redefine inline to __inline for msvc if necessary

Conflicts:
configure

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '0cff125200ab53fa3ae70d85b4f614f269fe3426'

* commit '0cff125200ab53fa3ae70d85b4f614f269fe3426':
  configure: Only add -FIstdlib.h for msvc/icl if necessary

Conflicts:
configure

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '9b4b96c0dee90d260891ec765b28f6ca15594340'

* commit '9b4b96c0dee90d260891ec765b28f6ca15594340':
  force WINAPI_FAMILY to WINAPI_FAMILY_DESKTOP_APP to be able to use dxva.h

Conflicts:
libavcodec/dxva2_internal.h

See: c5327df838396e7c43a56bdd141c0f01ba3edc94
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

avformat/isom: Use AVRN codec to handle AVDJ

Fixes cropping

Fixes Ticket4741

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avformat/hlsenc: Fix wording in comment

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

force WINAPI_FAMILY to WINAPI_FAMILY_DESKTOP_APP to use DVXA

The struct definitions in dxva.h, which are necessary in order to
actually use d3d11va, are hidden when WINAPI_FAMILY targets Windows Phone
or WindowsRT.

Building with WINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP is disallowed
when targeting ARM. ("Compiling Desktop applications for the ARM
platform is not supported.") So we set _CRT_BUILD_DESKTOP_APP to 0
to tell the runtime not to detect some issues with this mismatching.

The same tweaks to detect if the API is available is done in dxva2_internal.h
when compiling each DXVA2/D3D11VA decoders.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

configure: Only redirect strtoll to _strtoi64 if necessary

This isn't necessary any longer on MSVC 2013 Update 4.

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

configure: Only redefine inline to __inline for msvc if necessary

This isn't necessary on MSVC 2015 any longer.

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

configure: Only add -FIstdlib.h for msvc/icl if necessary

This is only necessary on MSVC 2010/2012 (and possibly on some
ICL versions). This both avoids an extra hack on newer MSVC
versions, and better documents what the extra compiler option
is used for.

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

force WINAPI_FAMILY to WINAPI_FAMILY_DESKTOP_APP to be able to use dxva.h

The struct definitions in dxva.h, which are necessary in order to
actually use d3d11va, are hidden when WINAPI_FAMILY targets Windows Phone
or WindowsRT.

Building with WINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP is disallowed
when targeting ARM. ("Compiling Desktop applications for the ARM
platform is not supported.") So we set _CRT_BUILD_DESKTOP_APP to 0
to tell the runtime not to detect some issues with this mismatching.

The same tweaks to detect if the API is available is done in dxva2_internal.h
when compiling each DXVA2/D3D11VA decoders.

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

movtextdec.c: Add support for fontsize

Add support for fontsize in style records. The patch uses reset to
directly change back to default style instead of using closing tags,
since we are not handling the default styles right now.

Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>

avcodec/nvenc: 2-pass mode works even with non-low latency presets now

Github: Closes #140

Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>

avcodec/avrndec: Fix cropping

This also switches to using a separate AVCodecContext for the inner mjpeg decoder
which is cleaner and avoids fields from being overwritten with wrong values

Fixes Ticket162

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/dvbsubdec: Compute default CLUT based on bitmap analysis

Fixes displaying subtitles before any CLUT has been received
Fixes Ticket153

This will of course not display these initial subtitles in the correct
color (as that is not known at that point) but they should look clean
and not corrupted

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '4d0d55cd623bcd504867f948849380f6b4060b4d'

* commit '4d0d55cd623bcd504867f948849380f6b4060b4d':
  checkasm: Use LOCAL_ALIGNED

See: f467fc02b475cd45b68aa5fb5f7c78286110ba86
See: 9e83ac6114de3d94eb992eff8ed810234069a7b2
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

checkasm: Use LOCAL_ALIGNED

Fixes alignment issues and bus errors.

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

swresample/x86: add missing colon to labels

Silences warnings with Nasm

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

x86/float_dsp: add missing colon to labels

Silences warnings with Nasm

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

x86/vf_interlace: add missing colon to labels

Silences warnings with Nasm

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

avcodec/x86: add missing colon to labels

Silences warnings with Nasm

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

avformat/hlsenc: Add WebVtt support in hls

Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/texturedsp: fix undefined shift

Silences warnings when using -Wshift-overflow (GCC 6+)

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>

avformat/ipmovie: Fix late audio detection

Fixes audio in Ticket117

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avformat/ipmovie: Parse&handle late audio init

Fixes Ticket117

Based on problem description by Kostya
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avformat/ipmovie: Factor init_audio() out

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

libavcodec/qsvdec_h264.c: using "private_spspps_buf" argument for av_bitstream_filter_filter() to avoid failure after decoder re-initialization.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

libavcodec/h264_mp4toannexb_bsf.c: Optional argument "private_spspps_buf" to avoid extradata modification.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '41d47ea85fb4ad9cfb5c2dc808a46bc1d57f3986'

* commit '41d47ea85fb4ad9cfb5c2dc808a46bc1d57f3986':
  lavc: add Intel libmfx-based HEVC decoder.

Conflicts:
Changelog
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/qsvdec.c
libavcodec/qsvdec_h2645.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit 'bf52f773913cf74bdf0d2c8c2cb4473fa1b7801e'

* commit 'bf52f773913cf74bdf0d2c8c2cb4473fa1b7801e':
  lavc: add Intel libmfx-based MPEG2 decoder.

Conflicts:
configure
libavcodec/qsvdec_mpeg2.c

Some cosmetics merged, rest is related to the removed parser code and
thus not merged

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/nvenc: Delay frame output to increase encoding speed

Merge commit 'f89f78c1c563d98f10ee1d7e1ed67c9f9e03b741'

* commit 'f89f78c1c563d98f10ee1d7e1ed67c9f9e03b741':
  lavc: add a HEVC mp4->annex B bitstream filter

Conflicts:
Changelog

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '96dca089b19bf55293136277f5b081c56146e10e'

* commit '96dca089b19bf55293136277f5b081c56146e10e':
  qsvdec: move qsv_process_data() from qsvdec_h264 to the common code

Conflicts:
libavcodec/qsvdec.c
libavcodec/qsvdec_h264.c

No change as the parser code has been removed

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

avfilter/Makefile: fix order of framestep filter

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

avfilter: add sidechain compress audio filter

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

Merge commit 'fa85fcf2b7d1ab822a59245077b8bb855406d3e9'

* commit 'fa85fcf2b7d1ab822a59245077b8bb855406d3e9':
  qsvenc_hevc: fix enum declaration

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/nvenc: Remove unused parameter

Merge commit '22522d9c2c69624fe4d81d61ee65a56610f22f1d'

* commit '22522d9c2c69624fe4d81d61ee65a56610f22f1d':
  qsvdec: fix a memleak of async_fifo

Conflicts:
libavcodec/qsvdec.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit 'aa9d15d89bb4ee8a31607d3db1b8c5334eb88d2d'

* commit 'aa9d15d89bb4ee8a31607d3db1b8c5334eb88d2d':
  qsvdec: avoid an infinite loop with no consumed data and no output

Conflicts:
libavcodec/qsvdec.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/aacps_fixed_tablegen: change f_center to 64bit to avoid overflow

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avutil/softfloat: Add a test for av_sincos_sf()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec: Add QSV VC-1 video decoder.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avformat/nutenc: Omit AV_PKT_DATA_QUALITY_STATS when storing side data.

This side data does not serve or improve decoding the data, it thus
would semantically be metadata and not side data.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

lavc: add Intel libmfx-based HEVC decoder.

lavc: add Intel libmfx-based MPEG2 decoder.

avcodec: Add QSV MPEG-2 video decoder.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

lavc: add a HEVC mp4->annex B bitstream filter

qsvdec: move qsv_process_data() from qsvdec_h264 to the common code

It will be shared with the upcoming mpeg2 and hevc decoders.

qsvenc_hevc: fix enum declaration

Declare a named enum, not a variable with anonymous enum type.

qsvdec: fix a memleak of async_fifo

init() is called whenever format changes, so current code would leak the
fifo in this case.

qsvdec: avoid an infinite loop with no consumed data and no output

This is triggerable with the HEVC decoder. It is unclear yet whether the
bug is in the calling code or the MSDK, but it seems better to check for
this in any case.

avcodec/dvdec: only attempt to conceal errors based on STA inconsistencies when error_concealment is set

This allows the user to disable it in the hypothetical case that STA values are wrong

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/aacps: Fix ;;

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/aactab: Add ff_aac_eld_window_480_fixed

Fixes pointer type mismatch

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/aactab: Fix rounding of elements in ff_aac_eld_window_512_fixed

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

swscale/output: Fix "warning: assignment from incompatible pointer type"

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avformat/async: wake up main thread before exit background thread

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avformat/async: move more code into locked area in background thread

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/dvdec: skip 3rd stage ac decoding when the headers indicates that the data is inconsistent

Fixes Ticket1589

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for VP9 intra functions

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

configure: fix LARGEADDRESSAWARE flag with MSVC

Otherwise it would get translated like a library path (-L option),
which breaks setting the flag.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/aacsbr: add missing header include

Fixes make checkheaders

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

Merge commit 'c9edbe4af901e9bc9f05a62319637f9760df9a4a'

* commit 'c9edbe4af901e9bc9f05a62319637f9760df9a4a':
  use a wrapper script to call MS link.exe to avoid mixing with /usr/bin/link.exe

See: 58ed7b632842f3fedbe737c3945cabc56bab2f47
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

use a wrapper script to call MS link.exe to avoid mixing with /usr/bin/link.exe

favor link over link.exe in case some wrapper script already exists
fallback to "link" in the path if the one next to cl is not found

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/dvdec: Retry decoding seemingly damaged MBs while skiping likely damaged parts

Improves decoding of Ticket1589

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

use a wrapper script to call MS link.exe to avoid mixing with /usr/bin/link.exe

Fallback to "link" in the path if the one next to cl is not found.

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

swscale: ayuv64le output support

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

swscale: ayuv64le input support

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

avutil: add ayuv64le and ayuv64be packed pixel format

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

avfilter: rename vf_reverse.c to f_reverse.c

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

avfilter: add areverse filter

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

libavcodec/qsvdec_h264.c: packet buffering has been removed since qsvdec.c does maintain own data buffering now.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

libavcodec/qsvdec.c: The ff_qsv_decode() now guarantees the consumption of whole packet.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/hapdec: Check that there is sufficient input data

Fixes Ticket4729

Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit 'a54e720e0289433d6bc3f7ba0a37fa5cabfaeea9'

* commit 'a54e720e0289433d6bc3f7ba0a37fa5cabfaeea9':
  configure: force -nologo- when detecting MSVC

Conflicts:
configure

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '44f7df0c987965763c609f6dc36974b04182e58d'

* commit '44f7df0c987965763c609f6dc36974b04182e58d':
  dds: Write the palette in the native endian form

Conflicts:
libavcodec/dds.c

See: 36a87c2dc7f302da3778bd0cff050b5c93a730c7
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

configure: force -nologo- when detecting MSVC

The -nologo- option is the inverse of -nologo, reenabling printing the
"logo" version header. This is useful if the compiler actually is a
wrapper that forces -nologo.

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

avcodec/hap: (trivial) rename enum values and document their meaning

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/hap: (trivial) clarify comment

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

dds: Write the palette in the native endian form

This fixes the palette on big endian, broken (or, differing from
little endian) since 57214b2f7.

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

hap: Name enums, remove unused struct member

snappy: Refactor so ff_snappy_uncompress() uses an existing buffer

Some uses of Snappy require uncompressing to positions within
an existing buffer. Also adds a function to get the uncompressed
length of Snappy data.

asfdec: remove the wrong condition

this condition breaks reading from the pipe as data_reached variable
have to be set to break while in the asf_read_header just after the Data
Object is found

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

hap: Fix slice size computation

A bug was introduced in 977105407cae55876041dddbf4ce0934cdd4cd6c whereby when
frame height wasn't divisible by the number of threads, pixels would be omitted
from the bottom rows during decode.

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

dds: Fix the slice size computation

A bug was introduced in 6b2b26e7af3ede0abfb46eb5725c26d1083f50bc whereby when
frame height wasn't divisible by the number of threads, pixels would be omitted
from the bottom rows during decode.

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

af_channelmap: properly set the supported output channel layouts

The current code expects query_formats() to be called exactly once, it
will leak if it's not called at all (filter initialized, but never
configured or used) or try to read freed memory if it's called more than
once.

Found-by: James Almer <jamrial@gmail.com>
CC: libav-stable@libav.org

asfdec: increment nb_streams right after the stream allocation

to prevent possible memory leaks

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

asfdec: set nb_streams to 0 in the asf_read_close

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

doc/filters.texi: fix two typos in reverse filter description

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

avfilter/vf_reverse: check also pts_size when reallocating

Fixes crash of x32.

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

Merge commit '11f3d5c69b711a1f1631961921ecd20d31f8336d'

* commit '11f3d5c69b711a1f1631961921ecd20d31f8336d':
  hap: Name enums, remove unused struct member

Conflicts:
libavcodec/hap.h

See: 440c26e9c46bb26bc1fc8306561ed6962ae7d3bf
See: d8488090e5070187e9d8d0a93b8d841f26bde990
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '083cbc930d077651ea7e3fbc32ec45352cfed7e7'

* commit '083cbc930d077651ea7e3fbc32ec45352cfed7e7':
  snappy: Refactor so ff_snappy_uncompress() uses an existing buffer

Conflicts:
libavcodec/hapdec.c
libavcodec/snappy.c

See: 17ee24af7e5f7112fe25c734236d521f9e35d80d
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/mips/vp9_idct_msa: Replace __volatile__ by volatile

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for VP9 idct functions

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

libavcodec/qsvdec_h264.c: refactoring: functionality of qsv_process_data() has been moved into qsvdec.c

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for VP9 lpf functions

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

lavc/hevc: rudimentary support for skip_loop_filter.

+~9% speed on Core i5 on test sample.

All frames are treated as ref frames, skipping only applies
at level "all". The following mail contains information on
how to improve that:
http://ffmpeg.org/pipermail/ffmpeg-devel/2015-July/176116.html

avcodec/hevc_parse: Print the name of the NAL units in addition to the numerical nal_unit_type in the debug output

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '7f388c0fabc51eca3106e7cc443393269435ab52'

* commit '7f388c0fabc51eca3106e7cc443393269435ab52':
  asfdec: remove the wrong condition

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit 'ae5a8dca675ee544178225256893e679b750cb63'

* commit 'ae5a8dca675ee544178225256893e679b750cb63':
  hap: Fix slice size computation

Conflicts:
libavcodec/hapdec.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>