Merge commit '31e558fbcfec8fa9fddf564ab8360384706e41c0'

* commit '31e558fbcfec8fa9fddf564ab8360384706e41c0':
  isom: add "NO16" FourCC

Conflicts:
libavformat/isom.c

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

Merge commit '6509012398435252979e149ea4a73438d2107600'

* commit '6509012398435252979e149ea4a73438d2107600':
  isom: add Radius DV YUV FourCCs

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

avformat/isom: remove duplicated line

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

Merge commit 'eeae858596a5ce5a84797283f590a16add5704f4'

* commit 'eeae858596a5ce5a84797283f590a16add5704f4':
  isom: Support Sony XAVC in mov

See: 5b9f39860d83380c4af3039710b4fcf3ea1f4c99
See: 6e65e3483706d969d176909fae9e216919f59277
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'c09804684a47e6572ee82ded5d84c8b282815da6'

* commit 'c09804684a47e6572ee82ded5d84c8b282815da6':
  isom: add xd51 hdcam

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

Merge commit '4d33873c2990b8d6096f60fef384f0efc4482b55'

* commit '4d33873c2990b8d6096f60fef384f0efc4482b55':
  hevc: make pps/sps ids unsigned where necessary

Conflicts:
libavcodec/hevc.h
libavcodec/hevc_ps.c

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

Merge commit 'ed06e5d92b4c67b49068d538461fbbe0a53a8c5e'

* commit 'ed06e5d92b4c67b49068d538461fbbe0a53a8c5e':
  hevc: Do not turn 32bit timebases into negative numbers

Conflicts:
libavcodec/hevc.c

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

Merge commit '6cc94e971933cd38c452172bb048bf760e65cc3e'

* commit '6cc94e971933cd38c452172bb048bf760e65cc3e':
  hevc: use av_mallocz() for allocating tab_ipm

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

Merge commit '920c01adce6c273fc043513ff237a6266e612152'

* commit '920c01adce6c273fc043513ff237a6266e612152':
  hevc: Use get_bits_long() in decode_vui()

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

isom: add "NO16" FourCC

isom: add Radius DV YUV FourCCs

isom: Support Sony XAVC in mov

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

isom: add xd51 hdcam

Someone needs to binary search FCP for new isom...

hevc: make pps/sps ids unsigned where necessary

Fixes integer overflow and out of array accesses.
Found-by: Mateusz j00ru Jurczyk and Gynvael Coldwind

hevc: Do not turn 32bit timebases into negative numbers

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind

hevc: use av_mallocz() for allocating tab_ipm

Fixes use of uninitialized memory and out of stack array read.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  float_dsp: fix errors in documentation

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

avutil/timer: Fix units for x86 after c708b5403346255ea5adc776645616cc7c61f078

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

Merge commit 'c708b5403346255ea5adc776645616cc7c61f078'

* commit 'c708b5403346255ea5adc776645616cc7c61f078':
  timer: use mach_absolute_time as high resolution clock on darwin

Conflicts:
configure

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

Merge commit '634d9d8b398982647b3d7160641198744901d8d8'

* commit '634d9d8b398982647b3d7160641198744901d8d8':
  arm: get_cabac inline asm

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

Merge commit 'dfe224f377be3e45758c69d881ca7874b82d647a'

* commit 'dfe224f377be3e45758c69d881ca7874b82d647a':
  aarch64: get_cabac inline asm

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

Merge commit '4506a854a4d846692ba71daeeff661dc214c8fa2'

* commit '4506a854a4d846692ba71daeeff661dc214c8fa2':
  arm: vp3: remove incorrect const in ff_vp3_idct_dc_add_neon declaration

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

hevc: Use get_bits_long() in decode_vui()

Fix assertion failure.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind

Merge remote-tracking branch 'cus/stable'

* cus/stable:
  libzvbi-teletextdec: split dvb packet to slices
  libzvbi-teletextdec: use av_dlog where possible

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: Use pkg-config for openjpeg

Conflicts:
configure

Not merged / merge just for metadata at request of carl

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

Merge commit '565e0c6d866ce08d4b06427456d3d1f4fd856e9c'

* commit '565e0c6d866ce08d4b06427456d3d1f4fd856e9c':
  movenc: allow override of "writing application" tag

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

Merge commit '0092c1dd8dac2d9e185b58503b447a0d3fb5230d'

* commit '0092c1dd8dac2d9e185b58503b447a0d3fb5230d':
  matroskaenc: allow override of "writing application" tag

Conflicts:
libavformat/matroskaenc.c

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

Merge commit '61985ad72c47bbb668f2d3923bf5c9df83e79323'

* commit '61985ad72c47bbb668f2d3923bf5c9df83e79323':
  arm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6

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

Merge commit '8c09532672d7d3196ec52afefa2c96633bc17b62'

* commit '8c09532672d7d3196ec52afefa2c96633bc17b62':
  rv10: K&R formatting cosmetics

Conflicts:
libavcodec/rv10.c

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

Merge commit 'b4d372e091f6b30758db2a43a5a9fe2510ec2b13'

* commit 'b4d372e091f6b30758db2a43a5a9fe2510ec2b13':
  rv10: Forward error from rv10_decode_packet

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

float_dsp: fix errors in documentation

timer: use mach_absolute_time as high resolution clock on darwin

Not guaranteed to be in nanosecond resolution. On iOS 7 the duration
of one tick is 125/3 ns which is still more than an order of magnitude
better then microseconds.

Replace decicycles with the neutral UNITS. Decicycles is strange but
tenths of a nanosecond and unspecific "deci"-ticks for mach_absolute_time
is just silly.

arm: get_cabac inline asm

Based on the aarch64 asm. CPU cycle counts on cortex-a9 compared to
gcc 4.8.2:
before: 475 decicycles in get_cabac_noinline, 67106035 runs, 2829 skips
after:  393 decicycles in get_cabac_noinline, 67106474 runs, 2390 skips

Overall speedup is above 2%. Code generated by clang 3.4 is slower on
the same hardware and the relative change is a little larger.

aarch64: get_cabac inline asm

Based on the x86 branchless get_cabac asm. get_cabac_noinline() gets
approximately 20% faster (no cycle counts available) compared to clang
from Xcode 5.1 beta5. More than 6% faster overall. A part of the overall
speedup might be explained by additional inlining of get_cabac().

arm: vp3: remove incorrect const in ff_vp3_idct_dc_add_neon declaration

Was missed in aeaf268e52fc11c1f64914a319e0edddf1346d6a when integrating
clear_blocks into the idct.

Merge commit 'a801453423420915425f902bf9f9cbe982a55d87'

* commit 'a801453423420915425f902bf9f9cbe982a55d87':
  g2meet: K&R formatting cosmetics

Conflicts:
libavcodec/g2meet.c

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

libzvbi-teletextdec: split dvb packet to slices

Instead of using the demux function of libzvbi to split the packet to slices
(vbi lines), lets do it ourselves.

- eliminates the 1 frame delay between page input and output
- handles non-ascending line numbers more gracefully
- enables us to return error codes on some invalid packets instead of silently
  ignoring them

Signed-off-by: Marton Balint <cus@passwd.hu>

libzvbi-teletextdec: use av_dlog where possible

Signed-off-by: Marton Balint <cus@passwd.hu>

build: Use pkg-config for openjpeg

Bug-Id: 387
CC: libav-stable@libav.org

movenc: allow override of "writing application" tag

Signed-off-by: Tim Walker <tdskywalker@gmail.com>
CC: libav-stable@libav.org

matroskaenc: allow override of "writing application" tag

Signed-off-by: Tim Walker <tdskywalker@gmail.com>
CC: libav-stable@libav.org

arm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6

The overread avoidance fix in cbddee1cca0ebd01e8c5aa694d31228eb4de4b41
broke the computation for the last row since it prevented the safe
reading from the height+1-th row.

CC: libav-stable@libav.org

rv10: K&R formatting cosmetics

Also sort #includes into canonical order.

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

rv10: Forward error from rv10_decode_packet

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

g2meet: K&R formatting cosmetics

Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavf/concatdec: reindent after last commit.
  lavf/concatdec: more reliable test for absolute URLs.
  lavf: add subfile protocol.
  lavfi/af_atempo: clear references before returning error.
  lavd/xv: take aspect ratio into account.
  lavc/pthread: copy packet side data.

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

Make 32bit RGB dshow input opaque.

Set codec_tag in dshow device, needed to distinguish between YUV and YVU.

Fixes ticket #3447.

lavf/concatdec: reindent after last commit.

lavf/concatdec: more reliable test for absolute URLs.

ff_make_absolute_url() recognizes the "://" pattern usual
in HTTP-like protocols, but consider relative URLs starting
with just the protocol name or using the comma syntax for
options.

lavf: add subfile protocol.

lavfi/af_atempo: clear references before returning error.

Once the frame has been given to ff_filter_frame(), it can
no longer be used, even on error.

Fix trac ticket #3430.

lavd/xv: take aspect ratio into account.

lavc/pthread: copy packet side data.

avcodec/vorbis: fix decoding of single element huffman trees

Fixes Ticket2893

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

avcodec/vorbis: return proper error codes from ff_vorbis_len2vlc()

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

avcodec/wmadec: initialize max_exponent to valid values

Fixes generation of NaN output
Fixes: nan_example.wma
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fic: Properly handle skip frames

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

Merge commit 'f69befe5eefef12172a6479dd9cef3c01bddec7a'

* commit 'f69befe5eefef12172a6479dd9cef3c01bddec7a':
  matroskadec: cosmetics: Fix "attachement" vs. "attachment" typo

Conflicts:
libavformat/matroskadec.c

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

Merge commit '84cfce9f99805a144df684417e166c1ae6f95421'

* commit '84cfce9f99805a144df684417e166c1ae6f95421':
  matroskadec: K&R formatting cosmetics

Conflicts:
libavformat/matroskadec.c

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

doc: fix typo

dxva2_vc1: include the start code in wMBbitOffset

This resolves a decoding failure on Intel GPUs.

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

dxva2_vc1: fix intensity compensation condition with interlaced fields

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

fic: Properly handle skip frames

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtmppkt: Rename the ts_delta field to ts_field

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

matroskadec: cosmetics: Fix "attachement" vs. "attachment" typo

Merge commit '8bbb02ae4f44f1cddc1ce1e74a71fa2022e93da3'

* commit '8bbb02ae4f44f1cddc1ce1e74a71fa2022e93da3':
  rtmppkt: Properly handle extended timestamps when writing

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

matroskadec: K&R formatting cosmetics

Also sort #includes into canonical order.

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

Merge commit '48cfb5f4114048383a4ee85b2f500eefce24cad2'

* commit '48cfb5f4114048383a4ee85b2f500eefce24cad2':
  rtmppkt: Add a descriptive comment

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

Merge commit '5b2ad78f97d43299adcb038c04346999fe9b196c'

* commit '5b2ad78f97d43299adcb038c04346999fe9b196c':
  rtmppkt: Handle extended timestamp field even for one-byte header

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

Merge commit '93d216d37a3f95190ecb9d51cf72f54ea4e04ec7'

* commit '93d216d37a3f95190ecb9d51cf72f54ea4e04ec7':
  dict: K&R formatting cosmetics

Conflicts:
libavutil/dict.c

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

rtmppkt: Rename the ts_delta field to ts_field

Based on a suggestion by Martin Panter. This is more descriptive,
since it's the actual timestamp field from the RTMP packet,
which might or might not be a delta depending on context (in
some packets it's a delta, in some packets it's an absolute
timestamp, and in some packets it's 0xffffff to indicate that
the actual delta or absolute timestamp is transmitted separately).

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

rtmppkt: Properly handle extended timestamps when writing

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

rtmppkt: Add a descriptive comment

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

rtmppkt: Handle extended timestamp field even for one-byte header

Related fix in "rtmpdump":
https://repo.or.cz/w/rtmpdump.git/commitdiff/79459a2

Adobe's RTMP specification (21 Dec 2012), section 5.3.1.3 ("Extended
Timestamp"), says "this field is present in Type 3 chunks". Type 3 chunks are
those with the one-byte header size.

This resolves intermittent hangs and segfaults caused by the read function,
and also includes an untested fix for the write function.

The read function was tested with ABC (Australia) News 24 streams, however
they are probably restricted to only Australian internet addresses. Some of
the packets at the start of these streams seem to contain junk timestamp
fields, often requiring the extended field. Test command:

avplay rtmp://cp81899.live.edgefcs.net/live/news24-med@28772

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

dict: K&R formatting cosmetics

doc/APIchanges: update versions & hashes

dxva2_h264: add a workaround for old intel GPUs

Old Intel GPUs expect the reference frame index to the actual surface,
instead of the index into RefFrameList as specified by the spec.

This workaround should be set when using one of the "ClearVideo" decoder
devices.

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

dxva2_h264: set the correct ref frame index in the long slice struct

The latest H.264 DXVA specification states that the index in this
structure should refer to a valid entry in the RefFrameList of the picture
parameter structure, and not to the actual surface index.

Fixes H.264 DXVA2 decoding on recent Intel GPUs (tested on Sandy and Ivy)

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libx265: Support API version 9

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

Merge commit 'b66382101cff33e2ce66500327a90d0a105eedeb'

* commit 'b66382101cff33e2ce66500327a90d0a105eedeb':
  dxva2: Increase maximum number of slices for mpeg2

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

Merge commit '5b977c1d4fd99f325049d48fb8f0a3240d50eef8'

* commit '5b977c1d4fd99f325049d48fb8f0a3240d50eef8':
  mxf: Return meaningful errors

Conflicts:
libavformat/mxfdec.c

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

Merge commit 'f06f6daaf8538eb8ceeb690b761f1256771b6ba6'

* commit 'f06f6daaf8538eb8ceeb690b761f1256771b6ba6':
  mxf: Parse random index pack

Conflicts:
libavformat/mxfdec.c

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

Merge commit '570af382eea902afe09f3562e5e1b483981cca7e'

* commit '570af382eea902afe09f3562e5e1b483981cca7e':
  mxf: Handle identification metadata

Conflicts:
libavformat/mxfdec.c

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

Merge commit '5b930092c3afd2ae01f1c8aa7fb405911d6ad416'

* commit '5b930092c3afd2ae01f1c8aa7fb405911d6ad416':
  mxf: Set audio packets pts

Conflicts:
libavformat/mxfdec.c

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

Merge commit 'e118bb1a33889d4df56f28975b4fd0793b4f5c32'

* commit 'e118bb1a33889d4df56f28975b4fd0793b4f5c32':
  mxf: Introduce ff_mxf_get_samples_per_frame

Conflicts:
libavformat/mxf.c
libavformat/mxf.h

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

Merge commit 'd48430c367947a64647c6959cf472f2c01778b17'

* commit 'd48430c367947a64647c6959cf472f2c01778b17':
  build: Let the SVQ3 decoder depend on the H.264 decoder

Conflicts:
libavcodec/Makefile

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

Merge commit '84bf8817206126dab3c9abf6055b593389bcb241'

* commit '84bf8817206126dab3c9abf6055b593389bcb241':
  configure: Split x86 SIMD architecture extensions into separate list

Conflicts:
configure

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

libx265: Support API version 9

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Fix spelling errors in texi files: accomodate -> accommodate allows to -> allows one to choosen -> chosen compability -> compatibility explictly -> explicitly overriden -> overridden specifed -> specified Trasmission -> Transmission

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

Fix spelling error 'Inconsistant -> Inconsistent'

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

Correct the FSF address for two avisynth files to '51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA'

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

dxva2: Increase maximum number of slices for mpeg2

Some content requires an higher number of slices in order to
render properly.

Rise the number to 1024 and warn if ever it exceeds.

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

mxf: Return meaningful errors

mxf: Parse random index pack

Get the last partition offset and use it when footer partition
offset is missing.

Footer partition may not be present and even if present footer
partition offset may not be set in any partition except last one.

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

mxf: Handle identification metadata

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

mxf: Set audio packets pts

Extrapolate audio timestamps based on the number of samples demuxed.

Deal with some MXF nastiness involving fractional number of
samples per EditUnit when seeking (the specs handwave this away).

Further fixes from Tomas Härdin.

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

mxf: Introduce ff_mxf_get_samples_per_frame

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

x86/dsputil: add emms to ff_scalarproduct_int16_mmxext()

Also undo the changes to ra144enc.c from previous commits.
Should fix ticket #3429

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

build: Let the SVQ3 decoder depend on the H.264 decoder

The SVQ3 decoder reuses large parts of the H.264 decoder so it
makes no sense to enable the former but not the latter.

Also drop unnecessary h263.o object from SVQ3 decoder object list.