Merge commit '13e4f2c7f7857feb6885f0c2ea8c9ddf438f46ea'

* commit '13e4f2c7f7857feb6885f0c2ea8c9ddf438f46ea':
  mpeg4videodec: Remove useless messages

Conflicts:
libavcodec/mpeg4videodec.c

not merged, the messages have been an important aid for debugging in old mpeg4
and help understanding bug reports

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

Merge commit '49e531ff4706279c7eed774f2c8b896942924ce2'

* commit '49e531ff4706279c7eed774f2c8b896942924ce2':
  mmal: Reference MMAL VC lib explicitly

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

Merge commit '2de7650451d90520135d8cf6f96caa0658824208'

* commit '2de7650451d90520135d8cf6f96caa0658824208':
  mmal: Move system headers before local headers

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

mpeg4videodec: Remove useless messages

They seem to sometimes trigger with old AVI files. They are just
confusing, do not help anyone, and use sloppy language.

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

mmal: Reference MMAL VC lib explicitly

This is optional, but ensures that linking with -Wl,--as-needed does not
drop the library containing the MMAL VC driver. The driver normally
"registers" itself in the library constructor, but since no symbols are
explicitly referenced, the linker could remove it with --as-needed
enabled.

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

mmal: Move system headers before local headers

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

avfilter/drawtext: fix frame mem leak

Signed-off-by: Ivan Efimov <ioefimov@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

aacenc: Adjust the initial offset for PNS values

This commit adjusts the intial offset for PNS values, introduced
with commit f7f71b5795d708763eb0c55fe5e2cb051b2b69f4 earlier. This
commit shifts the value in such a way that no further offsets are
required in the aaccoder.c file. Earlier version of the PNS patch had 2 offsets in both the aaccoder and aacenc.

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

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  lavf/mpegtsenc: Accept 0x000001 as startcode for hevc.

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

avcodec/atrac3plusdec: Free mdct contexts at the end

Fixes memleak

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

lavf/mpegtsenc: Accept 0x000001 as startcode for hevc.

Fixes ticket #4194.

avcodec/ffv1: dont leave stale pointers in memory

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

avcodec/ffv1: remove unneeded variable

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

avcodec/ffv1: use av_freep()

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

Merge commit '73dacabfc9b9ef1fd2c08105fdab6238ee29c2fc'

* commit '73dacabfc9b9ef1fd2c08105fdab6238ee29c2fc':
  ffv1: Check memory allocations

Conflicts:
libavcodec/ffv1.c

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

ffv1: Check memory allocations

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

h264: remove bogus YCgCo warning message

YCgCo decoding works just fine. It depends on the API user what is done
with the output. Some API users might support it, some not. Some users
might support it under certain circumstances only.

It is not the job of the decoder to print this message. If the API user
supports it, this message is extremely unhelpful.

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

avfilter/vf_scale: Add warning for AVCOL_SPC_YCGCO

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

lavf/mpeg: vobsub add an option to specify the .sub's URI

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

fate: add tta encoder test

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

lavf/http: handle case where the server returns a redirect during a seek

txoffer (e.g. http://tori.aoi-chan.com/ ) redirects to the same URI on your
first request, and serves the actual file on the second. It's stupid, but AFAIK
technically compliant. We'd previously see the server not handing back a Range
header and return an error; now, instead, we see that there's a redirect and
keep track of the offset we want while trying again at the new URL.

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

aacenc: Add support for Perceptual Noise Substitution energy values

This commit implements support for writing the noise energy values used in PNS.
The difference between regular scalefactors and noise energy values is that the latter
require a small preamble (NOISE_PRE + energy_value_diff) to be written as the first
noise-containing band. Any following noise energy values use the previous one to
base their "diff" on. Ordinary scalefactors remain unchanged other than that they ignore the noise values.

This commit should not change anything by itself, the following commits will bring it in use.

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

tests/fate: added mxf opatom audio regression tests

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

Merge commit '4e5443216445f3a9b8e6cb3fa4f448762e19006e'

* commit '4e5443216445f3a9b8e6cb3fa4f448762e19006e':
  rtsp: Fix unchecked return value

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

Merge commit '0b72a47f5592ecc035edd5bac57558ad9604612d'

* commit '0b72a47f5592ecc035edd5bac57558ad9604612d':
  rtsp: Check a malloc return value

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

avformat/rtsp: Fix dereference after null check

This fixes CID 732219

Reviewed-by: Thomas Volkert <silvo@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

swresample/swresample-test: Randomly wipe out channel counts

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

swresample: Check channel layouts and channels against each other and print human readable error messages

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

swresample: Allow reinitialization without ever setting channel layouts

swresample: Allow reinitialization without ever setting channel counts

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

rtsp: Fix unchecked return value

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

rtsp: Check a malloc return value

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

configure: add missing h263p decoder dependencies

Should fix ticket #4480

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

fate: Include branch information in the payload header

The server is properly equiped not to choke on that now.

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

avformat/rtpdec_asf: Fix potential pointer overflow

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

avformat/segafilm: Use av_malloc_array()

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

avformat/sierravmd: use av_malloc_array()

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

avfilter: add chorus filter

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

libavformat/mxfenc: added support mxf opatom audio muxing

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

fate: Add atrac3+ tests

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

libavformat/http.c: Make http-listen work as an input stream.

With this patch http can be used to listen for POST data to be used as an input stream.

Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/rtpproto: Move dscp into context & AVOptions

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

Merge commit 'bbdb50d7a8a91f38188fd15080d7f45f1540b3ac'

* commit 'bbdb50d7a8a91f38188fd15080d7f45f1540b3ac':
  libx265: print supported presets and tunes on error

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

Merge commit '7a9b764c0737f42cf2458c3c5378b0df216e14a2'

* commit '7a9b764c0737f42cf2458c3c5378b0df216e14a2':
  libdc1394: Unbreak build after c201069fa

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

libx265: print supported presets and tunes on error

Based on code from libavcodec/libx264.c

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

avformat/xwma: Use av_malloc_array()

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

avformat/wtvenc: Use av_realloc_array()

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

avformat/nsvdec: Use av_malloc_array()

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

libdc1394: Unbreak build after c201069fa

rtpenc_jpeg: handle case of picture dimensions not dividing by 8

This fixes the calculation of the number of needed blocks to make
sure that ALL pixels are represented by the result.

Reviewed-by: Thomas Volkert <silvo@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '4f373a5111f900af54301907132942f95276285c'

* commit '4f373a5111f900af54301907132942f95276285c':
  vfwcap: Unbreak building after c201069fa

Conflicts:
libavdevice/vfwcap.c

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

doc: add aarch64 cpuflags to fftools documentation

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

doc: add missing arm cpuflags to fftools documentation

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

doc: add missing x86 cpuflags to fftools documentation

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

Use @verbatim instead of @example for ASCII arts

Partially fixes #3869.

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

texi2pod: Handle @verbatim

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

vfwcap: Unbreak building after c201069fa

These headers can't be included in any arbitrary order.

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

tests: Do not include stdout/stderr or diff if the test passed

FATE currently discards this information anyway, so why waste the
disk space?

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

Add cabac test into fate

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

cabac-test: Return 1 if there are any errors

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

avcodec/libx265: print supported presets and tunes on error

Based on code from libavcodec/libx264.c

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>

avcodec/h264: Do not fail with randomly truncated VUIs

Fixes Ticket4445

Tested-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avdevice/vfwcap: revert header reordering from c201069fac9a76e6604f9d84d76a172434d62200

This should fix build on vs2013

Found-by: Ferdinand Oeinck <ferdo@bigroses.demon.nl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ffmdec: Check return value of ffm_append_recommended_configuration

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

avformat/rtsp: Fix unchecked return value

Reviewed-by: Thomas Volkert <silvo@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  lavf/flac: Autodetect raw flac files.

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

avutil/mips/intreadwrite: build fix for mips64r6 (instruction 'lwl' not supported)

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

configure: add support for 74kf cpu

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

configure: add support for mips64r6 and i6400 cpu

This is a preparation patch to submit optimized code for MSA (MIPS-SIMD-Architecture)

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

configure: add support for mips32r5, p5600 cpu and msa

Imagination Technologies has come up with MIPS Warrior Processor Cores.
More details can be found at-
http://www.imgtec.com/mips/warrior/pclass.asp
http://www.imgtec.com/mips/warrior/iclass.asp

This is a preparation patch to submit optimized code for MSA (MIPS-SIMD-Architecture)
This patch set is adding support for P5600 and I6400 CPUs.

MIPS 'generic' case is added, with mips32r2 arch as default (fpu and dsp opt enabled).

Sample configurations for new MSA architectures-
    $ ./configure --enable-cross-compile --cross-prefix=<PATH> --arch=mips --target-os=linux --cpu=p5600
    $ ./configure --enable-cross-compile --cross-prefix=<PATH> --arch=mips --target-os=linux --cpu=i6400

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/hqx: Use av_clip_uintp2()

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

lavf/flac: Autodetect raw flac files.

avcodec/libdcadec: honor AVCodecContext bitexact flag

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

libavcodec/hqx: multi threading support

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

Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc'

* commit '8d26c193fb42d08602ac93ece039d4718d029adc':
  avdevice: Apply a more consistent file naming scheme

Conflicts:
libavdevice/Makefile
libavdevice/alsa.h
libavdevice/alsa_dec.c
libavdevice/alsa_enc.c
libavdevice/sndio_enc.c

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

avdevice/vfwcap: put the headers back in the order in which they need to be

This avoids build failures

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

Merge commit 'c201069fac9a76e6604f9d84d76a172434d62200'

* commit 'c201069fac9a76e6604f9d84d76a172434d62200':
  avdevice: Add missing header for NULL_IF_CONFIG_SMALL

Conflicts:
libavdevice/alsa-audio-dec.c
libavdevice/alsa-audio-enc.c
libavdevice/pulse_audio_dec.c
libavdevice/sndio_enc.c
libavdevice/vfwcap.c
libavdevice/x11grab.c
libavdevice/xcbgrab.c

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

Merge commit '27852f2f1dec3749ea79883b70484c841169f747'

* commit '27852f2f1dec3749ea79883b70484c841169f747':
  libavformat: Handle error return from ff_listen_bind

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

Merge commit '0266988ccd15436eaf5f7bb6f9509e6bfd5ce589'

* commit '0266988ccd15436eaf5f7bb6f9509e6bfd5ce589':
  hqx: Fix clipping error in idct put function

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

Merge commit '783df7d5c5ab15f3d1afe2541c7d461c81c5c29d'

* commit '783df7d5c5ab15f3d1afe2541c7d461c81c5c29d':
  riff: Add 'M705' FourCC for mpeg2video

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

Merge commit '5980c924e309ae1dde8bd52d9938f94ff02602eb'

* commit '5980c924e309ae1dde8bd52d9938f94ff02602eb':
  dnxhd: Log the selected profile id

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

Merge commit 'be089af38f65dc8b1fe3564f98020fc815577edb'

* commit 'be089af38f65dc8b1fe3564f98020fc815577edb':
  mov: Rely on box type rather than file type for colr atom

Conflicts:
libavformat/mov.c

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

Merge commit 'f8fd0c29ce5dc7d4be13e7e89d0f1e8a035ae71b'

* commit 'f8fd0c29ce5dc7d4be13e7e89d0f1e8a035ae71b':
  v210: Fix typo in header guards

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

avcodec/nvenc: Add options for level and tier

Previous version reviewed-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/h264: Use only one ERContext

This fixes slice threads with error concealment

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

avdevice: Apply a more consistent file naming scheme

avdevice: Add missing header for NULL_IF_CONFIG_SMALL

Also reshuffle headers into canonical order where appropriate.

libavformat: Handle error return from ff_listen_bind

Handle error return from ff_listen_bind without leaking file descriptors.

Signed-off-by: Anders Nystrom <anders.nystrom@southpole.se>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

hqx: Fix clipping error in idct put function

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

riff: Add 'M705' FourCC for mpeg2video

dnxhd: Log the selected profile id

avcodec/h264: Be more tolerant to changing pps id between slices

Fixes Ticket4446

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

mov: Rely on box type rather than file type for colr atom

Although it's not allowed to use only allows 'nclc' in ISOM files, there
are samples that do not always respect this rule. This change prevents
atom overread and a spurious color range initialization.

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

v210: Fix typo in header guards

avfilter/vsrc_life: Fix mix of declarations and statements

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

vda: Cast to not discard constant qualifier and silence compiler warning

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

avutil/x86/Makefile: fix conditional x86/emms.o build

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

avcodec/aacdec: Fix storing state before PCE decode

Fixes Ticket4460

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

avcodec/h264_ps: Move truncation check from VUI to SPS

This more completely checks for truncation

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

microdvd: do not export framerate hint as subtitle packet

MicroDVD has a "hack" for specifying the video framerate the subtitle
was authored against. The demuxer reads this hint correctly, but didn't
skip it correctly.

This was not noticed, because the exported packet has its duration set
to 0, making it invisible (depending on the API user's rendering logic).

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