Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Give IDCT matrix transpose macro a more descriptive name

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

x86/imdct36: use sse3 instructions in the last BUTTERF step when possible

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

x86/imdct36: don't build imdct36_float_sse on x86_64 targets

There's an SSE2 version as well, and x86_64 guarantees that
instruction set is present.

Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Give IDCT matrix transpose macro a more descriptive name

This also avoids a macro name clash and related warning on ARM.

avcodec/mjpegdec: convert CMYK to GBRAP

Fixes Ticket2799

This should be moved into swscale once we have a CMYK pixel format

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

avcodec/mjpegdec: fix decoding 4th plane

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

avcodec/mjpegdec: Print error in case of CMYK

Also fail if AV_EF_EXPLODE is set.
We do not fail by default, but rather return some image as it may be usefull to the
end user to see what is on the image, for example text could be read quite fine and
objects recognized.

Possibly fixes Ticket3424

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

avcodec/mjpegdec: parse adobe_transform

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

avcodec/mjpegdec: Print human readable string for APPx

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

Fix http authentication.

Add parenthesis around "MD5" in the request string as required by
RFC 2069.

Fixes ticket #3417.

Reported and tested by Haarman
Analyzed-by: Eugen-Andrei Gavriloaie

avcodec/h264: allow mixing idr and non idr slices with frame threading again

This combination exists in the wild
Fixes Ticket3131

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

avformat/mov: simplify code setting needs_parsing

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

avcodec/h264_refs: remove lost frames instead of disfavoring them

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  af_compand: add a dependency on strtok_r

Conflicts:
configure

Not merged as FFmpegs compand filter does not depend on strtok_r
Merged-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/h264: fix droped frame handling also for threads > 1

Seems i mistakely tested just with threads=1
Fixes part of Ticket3386

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

avcodec/h264: avoid using lost frames as references

Fixes Ticket3386

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: Do not redundantly specifiy H.263-related object files for MSMPEG4v*

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

af_compand: add a dependency on strtok_r

build: Do not redundantly specifiy H.263-related object files for MSMPEG4v*

These are already covered through dependencies specified in configure.

libavcodec/rawdec: avoid memcpy when performing 16-bit samples shift

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

configure: use pkg-config to detect libbluray

The current configure fails when static libbluray is compiled with libxml2
support.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/parser: put lost comments back

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

avformat/sdr2: h264 stream needs parsing

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

avfilter: remove superflous lines

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

avfilter/af_compand: some more cosmetics to decrease difference with qatar

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

avfilter: remove af_compand_fork

All relevant changes except the float/double one have been merged

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

avfilter/af_compand: more cosmetics from libavfilter/af_compand_fork.c

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

avfilter/af_compand: cosmetics from libavfilter/af_compand_fork.c

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

avfilter/af_compand: switch defaults to libavfilter/af_compand_fork.c

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

avfilter/af_compand: "use local variable for channels" from libavfilter/af_compand_fork.c

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

avfilter/af_compand: error checks from libavfilter/af_compand_fork.c

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

avfilter/af_compand: pts init code from libavfilter/af_compand_fork.c

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

avfilter/af_compand: cosmetics and doxy comment from libavfilter/af_compand_fork.c

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

avfilter/af_compand: add Andrew Kelley to the copyright

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

avfilter/af_compand: merge avframe code from af_compand_fork

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

avfilter/af_compand: merge uninit() calls on error from af_compand_fork.c

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

avfilter/af_compand: also support '|' as seperator

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

avfilter/af_compand_fork: avoid strtok_r() so as not to break build

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

avfilter/af_compand: whitespace changes from af_compand_fork

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavfi: add compand audio filter

Conflicts:
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/af_compand.c
libavfilter/allfilters.c
libavfilter/version.h

The filter is added as new one so as to ease clean merging of its changes
in debug-able steps
See: 6b68e2a43b3407522080be50a2a19cff2f9715ef
Merged-by: Michael Niedermayer <michaelni@gmx.at>

lavfi: add compand audio filter

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

Read bits_per_coded_sample from V_MS/VFW/FOURCC mkv files.

Fixes ticket #3425.

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  parser: cosmetics: Drop some unnecessary parentheses

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

Merge commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a'

* commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a':
  libavfilter: example audio filtering program

Conflicts:
.gitignore
configure
doc/Makefile

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

avfilter/af_compand: fix invalid read

Fixes #3383.

Merge commit 'a1c699659d56b76c0bf399307f642c6fd6d28281'

* commit 'a1c699659d56b76c0bf399307f642c6fd6d28281':
  parser: K&R formatting cosmetics

Conflicts:
libavcodec/parser.c

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

Merge commit 'ed61f3ca8a0664a697782253b354055136c5d303'

* commit 'ed61f3ca8a0664a697782253b354055136c5d303':
  parser: Remove commented-out cruft

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

mpegvideo: re-indent buffer clearing code

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

mpegvideo: fix overwriting hwaccel surface objects

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

parser: cosmetics: Drop some unnecessary parentheses

libavfilter: example audio filtering program

Based on a patch by Andrew Kelley <superjoe30@gmail.com>

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

avcodec/vp8dsp: use AV_ZERO64 to clear idct coefficient rows

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

parser: K&R formatting cosmetics

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

parser: Remove commented-out cruft

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  texi2pod: always declare the pod file as UTF-8 encoded

Conflicts:
doc/texi2pod.pl

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

lavu/buffer: add release function

new function allows to unref buffer and obtain its data.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ffmpeg_opt: get_preset_file_2(): fix avio_open2() return  code check

avio_open2() only return < 0 when error.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

texi2pod: always declare the pod file as UTF-8 encoded

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc: fix one accented word

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

Merge commit '48d1ed9c83ee0c388e8c2898e81ffb4add509ab9'

* commit '48d1ed9c83ee0c388e8c2898e81ffb4add509ab9':
  doc: name correct header

Conflicts:
doc/APIchanges

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

Merge commit '39c2880eeae6930b1036ce1f479afc1e1152c13f'

* commit '39c2880eeae6930b1036ce1f479afc1e1152c13f':
  af_volume: preserve frame properties

Conflicts:
libavfilter/af_volume.c

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

Merge commit 'dcc7e4bf1d0913123bfafbc58bf47bd41dd5848d'

* commit 'dcc7e4bf1d0913123bfafbc58bf47bd41dd5848d':
  af_resample: preserve frame properties

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

Merge commit '67f2a688143b644f99360565a9f36c61a5f052e9'

* commit '67f2a688143b644f99360565a9f36c61a5f052e9':
  avconv: remove a write-only variable

Conflicts:
ffmpeg.c
ffmpeg.h

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

Merge commit '8aca00cc2b25810bdd85b75f5632844a5614b707'

* commit '8aca00cc2b25810bdd85b75f5632844a5614b707':
  libx265: Properly handled dynamic linking with MSVC

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

Merge commit '0f7fa48cf1a36ed135c9e0cb01a6b84179aea25b'

* commit '0f7fa48cf1a36ed135c9e0cb01a6b84179aea25b':
  libx265: Support SAR

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

Merge commit '2142b2efcd631db05e4c7c26785e337ecf1258ff'

* commit '2142b2efcd631db05e4c7c26785e337ecf1258ff':
  libx265: Support 4:4:4

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

Merge commit 'd00a504b244e136a0c82a55e21ed94659e0674ad'

* commit 'd00a504b244e136a0c82a55e21ed94659e0674ad':
  libx265: Update API usage

Conflicts:
libavcodec/libx265.c

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

avformat/options_table: add named constants for avoid_negative_ts

Idea-by: ubitux
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

doc: fix one accented word

doc: name correct header

af_volume: preserve frame properties

af_resample: preserve frame properties

avconv: remove a write-only variable

libx265: Use proper error code

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

libx265: Properly handled dynamic linking with MSVC

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

libx265: Support SAR

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

libx265: Support 4:4:4

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

libx265: Update API usage

Framerate is now a sane rational instead of an integer, and
inputDepth is changed to what it actually is.

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

libx265: Properly handled dynamic linking with MSVC

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

libx265: Support SAR

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

libx265: Support 4:4:4

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

libx265: Update API usage

Framerate is now a sane rational instead of an integer, and
inputDepth is changed to what it actually is.

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Use av_frame_copy() to simplify code where appropriate.

Conflicts:
libavfilter/vf_copy.c

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

Merge commit '8feac29cc46270cc89d6016340e7bac780877131'

* commit '8feac29cc46270cc89d6016340e7bac780877131':
  lavc: use AVFrame API properly in ff_reget_buffer()

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

avutil/frame_copy_audio: also check that channels match

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

Merge commit '1155fd02ae7bac215acab316e847c6bb25f74fc3'

* commit '1155fd02ae7bac215acab316e847c6bb25f74fc3':
  frame: add a convenience function for copying AVFrame data

Conflicts:
doc/APIchanges
libavutil/frame.c
libavutil/version.h

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

Merge commit '746dca483a2f0f2639265f6e1c0085c8861875a1'

* commit '746dca483a2f0f2639265f6e1c0085c8861875a1':
  avconv: support forcing codec tags for input streams

Conflicts:
doc/ffmpeg.texi

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

x86: Move XOP emulation to x86util

We need the emulation to support the cases where the first
argument is the same as the fourth. To achieve this a fifth
argument working as a temporary may be needed.
Emulation that doesn't obey the original instruction semantics
can't be in x86inc.

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

swr: check that the context for swr_convert() has been initialized

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

swresample: add swr_is_initialized()

Idea-from/based-on: 7e86c27b4ee9e5a3fbe6cf5249b9d918b2a5e731
Reviewed-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Use av_frame_copy() to simplify code where appropriate.

lavc: use AVFrame API properly in ff_reget_buffer()

frame: add a convenience function for copying AVFrame data

avconv: support forcing codec tags for input streams

oggdec: validate VP8 keyframes

Fixes seeking with broken files

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: add detection for Bit Manipulation Instruction sets

Conflicts:
libavutil/x86/cpu.c

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

Merge commit '1b932eb1508f550fac9e911923a0383efda53aa3'

* commit '1b932eb1508f550fac9e911923a0383efda53aa3':
  x86: add detection for FMA3 instruction set

Conflicts:
configure
libavutil/cpu.h
libavutil/x86/cpu.c

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

Merge commit '10b0161d78148f46eaffb29ea022378947eaef2c'

* commit '10b0161d78148f46eaffb29ea022378947eaef2c':
  x86: add missing XOP checks and macros

Conflicts:
configure
libavutil/x86/cpu.h

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

Merge commit '5800ba0db667630e6ff81d30f03961ea10726aa6'

* commit '5800ba0db667630e6ff81d30f03961ea10726aa6':
  configure: disable cpunop if the check fails

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

configure: Move cpunop into ARCH_EXT_LIST_X86

It is a processor feature, so it belongs there.

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