Merge commit '4e5aa080bb8d83cb6de1ffbdd7b37ec34bc6b30b'

* commit '4e5aa080bb8d83cb6de1ffbdd7b37ec34bc6b30b':
  truehd: break out part of rematrix_channels into platform-specific callback.

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

truehd: break out part of rematrix_channels into platform-specific callback.

Verified with profiling that this doesn't have a measurable effect upon
overall performance.

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

Merge commit '15a29c39d9ef15b0783c04b3228e1c55f6701ee3'

* commit '15a29c39d9ef15b0783c04b3228e1c55f6701ee3':
  truehd: add hand-scheduled ARM asm version of mlp_filter_channel.

Conflicts:
libavcodec/arm/Makefile
libavcodec/arm/mlpdsp_init_arm.c

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

truehd: add hand-scheduled ARM asm version of mlp_filter_channel.

Profiling results for overall audio decode and the mlp_filter_channel(_arm)
function in particular are as follows:

              Before          After
              Mean   StdDev   Mean   StdDev  Confidence  Change
6:2 total     380.4  22.0     370.8  17.0    87.4%       +2.6%  (insignificant)
6:2 function  60.7   7.2      36.6   8.1     100.0%      +65.8%
8:2 total     357.0  17.5     343.2  19.0    97.8%       +4.0%  (insignificant)
8:2 function  60.3   8.8      37.3   3.8     100.0%      +61.8%
6:6 total     717.2  23.2     658.4  15.7    100.0%      +8.9%
6:6 function  140.4  12.9     81.5   9.2     100.0%      +72.4%
8:8 total     981.9  16.2     896.2  24.5    100.0%      +9.6%
8:8 function  193.4  15.0     103.3  11.5    100.0%      +87.2%

Experiments with adding preload instructions to this function yielded no
useful benefit, so these have not been included.

The assembly version has also been tested with a fuzz tester to ensure that
any combinations of inputs not exercised by my available test streams still
generate mathematically identical results to the C version.

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

avfilter/vf_pullup: add comment to explain memset(0)

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

truehd: break out part of rematrix_channels into platform-specific callback.

Verified with profiling that this doesn't have a measurable effect upon
overall performance.

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

truehd: add hand-scheduled ARM asm version of mlp_filter_channel.

Profiling results for overall audio decode and the mlp_filter_channel(_arm)
function in particular are as follows:

              Before          After
              Mean   StdDev   Mean   StdDev  Confidence  Change
6:2 total     380.4  22.0     370.8  17.0    87.4%       +2.6%  (insignificant)
6:2 function  60.7   7.2      36.6   8.1     100.0%      +65.8%
8:2 total     357.0  17.5     343.2  19.0    97.8%       +4.0%  (insignificant)
8:2 function  60.3   8.8      37.3   3.8     100.0%      +61.8%
6:6 total     717.2  23.2     658.4  15.7    100.0%      +8.9%
6:6 function  140.4  12.9     81.5   9.2     100.0%      +72.4%
8:8 total     981.9  16.2     896.2  24.5    100.0%      +9.6%
8:8 function  193.4  15.0     103.3  11.5    100.0%      +87.2%

Experiments with adding preload instructions to this function yielded no
useful benefit, so these have not been included.

The assembly version has also been tested with a fuzz tester to ensure that
any combinations of inputs not exercised by my available test streams still
generate mathematically identical results to the C version.

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

avfilter/vf_pullup: zero freed memory for saftey

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

vf_pullup: simplify, fix double free error

The memory allocation for f->diffs was freed multiple times in some
corner cases. Simplify the code so that this doesn't happen.

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

avutil/frame: undeprecate AVFrame.motion_val API

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

avcodec/h264_mp4toannexb_bsf: prepend global headers before any in stream parameter sets

Fixes h264_mp4toannexb_bsf_failure.mkv

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: hpeldsp: Keep all rnd_template instantiations in hpeldsp_init

Conflicts:
libavcodec/x86/rnd_mmx.c

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

Merge commit '55d7f26e7bcf1dfb69ee986aa9fc21c62e0b3ae6'

* commit '55d7f26e7bcf1dfb69ee986aa9fc21c62e0b3ae6':
  hpeldsp_template: Move content to hpeldsp

Conflicts:
libavcodec/hpeldsp_template.c

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

Merge commit '09d4389de10b03ea65a84eaf3d6c4b7a7538ad75'

* commit '09d4389de10b03ea65a84eaf3d6c4b7a7538ad75':
  hpeldsp_template: Drop av_unused attribute from *_no_rnd_pixels16_8_c functions

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

Merge commit '92ba965103d3884609730ba9bf293772dc78a9ef'

* commit '92ba965103d3884609730ba9bf293772dc78a9ef':
  dsputil: Move draw_edges and clear_block* out of dsputil_template

Conflicts:
libavcodec/dsputil.c

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

Merge commit 'da5be235250a61d6994408b054e3e3acf2e0f90f'

* commit 'da5be235250a61d6994408b054e3e3acf2e0f90f':
  dsputil: Move RV40-specific bits into rv40dsp

Conflicts:
libavcodec/dsputil.c
libavcodec/rv40dsp.c

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

Merge commit '8011ac911b3f282b9fb64a0fc15404f8bfc7b7ed'

* commit '8011ac911b3f282b9fb64a0fc15404f8bfc7b7ed':
  hpeldsp_template: Detemplatize the code

Conflicts:
libavcodec/hpeldsp_template.c

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

Merge commit '2c01ad8b206d326700974438f7193f22be416eb1'

* commit '2c01ad8b206d326700974438f7193f22be416eb1':
  dsputil_template: Detemplatize the code

Conflicts:
libavcodec/dsputil.c

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

Merge commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f'

* commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f':
  Add missing headers to make template files compile (more) standalone

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

Merge commit 'e7373585f827d4ec05d952daa3877e8decfe3c08'

* commit 'e7373585f827d4ec05d952daa3877e8decfe3c08':
  dsputil_template: Move bits that are used templatized into separate file

Conflicts:
libavcodec/dsputil_template.c

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

Merge commit 'd3c3c1664a958923f234283e66fbcbfe69a6927f'

* commit 'd3c3c1664a958923f234283e66fbcbfe69a6927f':
  dsputil: Move hpel_template #include out of dsputil_template

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

Merge commit 'd0aabeab23755ee906440505ad2097c0f1493e80'

* commit 'd0aabeab23755ee906440505ad2097c0f1493e80':
  x86: h264_qpel: Fix typo in CALL_2X_PIXELS macro invocation

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

x86: hpeldsp: Keep all rnd_template instantiations in hpeldsp_init

There is no point in having a separate file just for the instantiation
that provides the public functions.

hpeldsp_template: Move content to hpeldsp

There is no point in having this separate; it is not used as a template.

hpeldsp_template: Drop av_unused attribute from *_no_rnd_pixels16_8_c functions

dsputil: Move draw_edges and clear_block* out of dsputil_template

The functions are not used templatized.

dsputil: Move RV40-specific bits into rv40dsp

hpeldsp_template: Detemplatize the code

The indirection makes no sense without multiple instantiation.

dsputil_template: Detemplatize the code

The indirection makes no sense without multiple instantiation.

Add missing headers to make template files compile (more) standalone

dsputil_template: Move bits that are used templatized into separate file

This allows detemplatizing the bits that are not instantiated twice.

dsputil: Move hpel_template #include out of dsputil_template

Multiple inclusion makes no sense as it is only used in the 8-bit case.

x86: h264_qpel: Fix typo in CALL_2X_PIXELS macro invocation

This fixes FATE with mmxext CPUFLAGS set.

avcodec/h261: move b_stride/b_xy under the if() where they are used

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

avcodec/hevc: Export picture type

This only uses the first slice, improvement here is welcome
analyzing all slices the trivial way would interfere with threads

Fixes Ticket3185

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

avcodec/h261dec: fix motion vector vissualization

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avcodec: add missing includes

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

Merge commit 'aa499568afc01d59215eef7e5b14b949a9671afc'

* commit 'aa499568afc01d59215eef7e5b14b949a9671afc':
  avconv: More descriptive message about framedrop

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

Merge commit '6ee55c7b111eec6c51dfdc0fddbd46f5dd867fa3'

* commit '6ee55c7b111eec6c51dfdc0fddbd46f5dd867fa3':
  vf_transpose: K&R formatting cosmetics

Conflicts:
libavfilter/vf_transpose.c

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

x86/cpu: check for OS support before enabling AVX2

AV_CPU_FLAG_AVX is enabled at this point only if there's OS support.

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

udp: mention default in documentation

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

dshow: log error and continue if unable to set audio buffer

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Add an .oga muxer.

Do not set swscale sizeFactor to -1.

Fixes ticket #3495.

swscale: add two spatially stable dithering methods

Both of these dithering methods are from http://pippin.gimp.org/a_dither/ for
GIF they can be considered better than bayer (provides more gray-levels), and
spatial stability - often more than twice as good compression and less visual
flicker than error diffusion methods (the methods also avoids error-shadow
artifacts of diffusion dithers).

These methods are similar to blue/green noise type dither masks; but are
simple enough to generate their mask on the fly. They are still research work
in progress; though more expensive to generate masks (which can be used in a
LUT) like 'void and cluster' and similar methods will yield superior results

libavcodec/*/vp8dsp_init: indent

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/riff: add On2 VP7 fourccs

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

On2 VP7 decoder

Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: BBB
previous patch reviewed by jason
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/vp8: vp8_find_free_buffer

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec: add missing includes

avconv: More descriptive message about framedrop

vf_transpose: K&R formatting cosmetics

avcodec/svq1enc: fix undefined pointer operation

Fixes Ticket3152

This also removes the dependance on ff_init_block_index/ff_update_block_index()

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

avcodec/x86/mpegvideoenc_template: fix integer overflow

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

dox/scaler:fix bicubiclin typo

See Ticket3486

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libx265: Only use one memcpy for headers

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

Merge commit '60728e8bab8d2a5f6bbb4baa7d53142dbc6047ed'

* commit '60728e8bab8d2a5f6bbb4baa7d53142dbc6047ed':
  libx265: Write global extradata when requested

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

Merge commit '8ef33497a6a3ed05d2f931809c074ef3d1878834'

* commit '8ef33497a6a3ed05d2f931809c074ef3d1878834':
  build: Add config option for CABAC code

Conflicts:
configure
libavcodec/Makefile

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

avcodec/h264: use ff_h264_set_erpic() instead of memset

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

ffmpeg: move packet deallocation into write_frame

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avconv: don't warn on multiple frames per packet for codecs that expect it

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

Merge commit '4754345027eb85cfa51aeb88beec68d7b036c11e'

* commit '4754345027eb85cfa51aeb88beec68d7b036c11e':
  avconv: print verbose per-stream transcoding statistics

Conflicts:
ffmpeg.c

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

Merge commit 'a220b07b0f971f88213aef012aea51af2800be62'

* commit 'a220b07b0f971f88213aef012aea51af2800be62':
  avconv: split printing the final statistics into a separate function

Conflicts:
ffmpeg.c

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

libx265: Only use one memcpy for headers

They're guaranteed by the x265 API to be contiguous in memory.

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

libx265: Simple cosmetic fix

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

libx265: Only use one memcpy for headers

They're guaranteed by the x265 API to be contiguous in memory.

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

libx265: Write global extradata when requested

Matroska, MP4, and other containers require it.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Merge commit 'baeb59d89beda499688e528c6a269d2b255b66f2'

* commit 'baeb59d89beda499688e528c6a269d2b255b66f2':
  avconv: rewrite output data size tracking

Conflicts:
ffmpeg.c

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

Merge commit 'f759f66e367bc62ed7738a51040f775b656a60d8'

* commit 'f759f66e367bc62ed7738a51040f775b656a60d8':
  avconv: explicitly report when the muxing overhead is unknown

Conflicts:
ffmpeg.c

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

Merge commit '781d97fd54b1f0d8f4f7536dbd932dca6445476e'

* commit '781d97fd54b1f0d8f4f7536dbd932dca6445476e':
  avconv: remove unused nb_frames_dup

Conflicts:
ffmpeg.c

No change, as the variable is not unused

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

build: Add config option for CABAC code

This allows for more elegant dependency and object declarations.

Merge commit 'b4679ecdbd80ae050094733f137ccd7ebf1316ab'

* commit 'b4679ecdbd80ae050094733f137ccd7ebf1316ab':
  {v,a}f_showinfo: print frame side data

Conflicts:
libavfilter/af_ashowinfo.c
libavfilter/vf_showinfo.c

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

Merge commit '15c5a8d22d12d29a364ca2ab6438f1dee2fa08c7'

* commit '15c5a8d22d12d29a364ca2ab6438f1dee2fa08c7':
  mp3dec: export replaygain tags from ID3v2

Conflicts:
Changelog

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

Merge commit '06c3cd3c0186803619bc6aad2d8f06c3e9015d15'

* commit '06c3cd3c0186803619bc6aad2d8f06c3e9015d15':
  af_volume: support using replaygain frame side data

Conflicts:
doc/filters.texi
libavfilter/af_volume.c
libavfilter/af_volume.h

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

Merge commit 'd161ae0a37900cbd36c1390ca32a56b892c02ab5'

* commit 'd161ae0a37900cbd36c1390ca32a56b892c02ab5':
  frame: add a function for removing side data from a frame

Conflicts:
libavutil/version.h

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

Merge commit '59444c76e6d43529a12dbd80b6dd29c6ba4079a9'

* commit '59444c76e6d43529a12dbd80b6dd29c6ba4079a9':
  avconv: add stream-global side data to the first demuxed packet

Conflicts:
ffmpeg.c

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

Merge commit '4a0f6651434c6f213d830140f575b4ec7858519f'

* commit '4a0f6651434c6f213d830140f575b4ec7858519f':
  libavcodec: when decoding, copy replaygain side data to decoded frames

Conflicts:
libavcodec/internal.h
libavcodec/rawdec.c
libavcodec/utils.c

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

Merge commit '5a7e35dd2351c30bab45177b9482cb8833a0ca78'

* commit '5a7e35dd2351c30bab45177b9482cb8833a0ca78':
  Add replaygain side data type and code for parsing replaygain tags.

Conflicts:
libavcodec/avcodec.h
libavcodec/version.h
libavutil/version.h

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

Merge commit '25b32586566f285d797737863c97a1c5c9c84e2b'

* commit '25b32586566f285d797737863c97a1c5c9c84e2b':
  lavf: add an AVStream field for exporting stream-global side data

Conflicts:
libavformat/utils.c
libavformat/version.h

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

Merge commit '0e2c3ee9a335d8a0a5edf0509e222e804d7b2619'

* commit '0e2c3ee9a335d8a0a5edf0509e222e804d7b2619':
  lavc: give a typedeffed name to the AVPacket.side_data struct

Conflicts:
doc/APIchanges
libavcodec/version.h

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

avconv: don't warn on multiple frames per packet for codecs that expect it

avconv: print verbose per-stream transcoding statistics

avconv: split printing the final statistics into a separate function

avconv: rewrite output data size tracking

Store a variable per OutputStream instead of globals for
audio/video/extradata. This makes the code simpler and cleaner and fixes
2pass with multiple output streams.

avconv: explicitly report when the muxing overhead is unknown

avconv: remove unused nb_frames_dup

Frame duplication now happens in vf_fps.

{v,a}f_showinfo: print frame side data

mp3dec: export replaygain tags from ID3v2

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Remove dcbzl check for e500v1 and e500v2 architectures

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

af_volume: support using replaygain frame side data

frame: add a function for removing side data from a frame

avconv: add stream-global side data to the first demuxed packet

libavcodec: when decoding, copy replaygain side data to decoded frames

Add replaygain side data type and code for parsing replaygain tags.

lavf: add an AVStream field for exporting stream-global side data

lavc: give a typedeffed name to the AVPacket.side_data struct

Merge commit '5b8f0a5eac75d16376af60a6f6bb79b3e9e6dab7'

* commit '5b8f0a5eac75d16376af60a6f6bb79b3e9e6dab7':
  mpeg: K&R formatting cosmetics

Conflicts:
libavformat/mpeg.c

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

swscale/swscale: fix integer overflow

Should fix fate failure with clang ftrapv

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

fate: add tests for linearly interpolated resampling

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

tests/tiny_psnr: Print information about the supported sample types in the help and error texts

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