Merge commit 'd995f0a1550c9148140eab34c7d770e90925c004'

* commit 'd995f0a1550c9148140eab34c7d770e90925c004':
  log: Unbreak no-tty support on 256color terminals

Conflicts:
libavutil/log.c

No change, FFmpeg is not affected by this bug

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

libavfilter/af_amix: avoid derreferencing possible null

ff_all_channel_layouts() might return null on alloc failure.

Fixes CID1241516

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

libavfilter/af_channelmap: avoid derreferencing possible null

ff_all_channel_layouts() might return null on alloc failure.

Fixes CID1241517

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

libavfilter/af_join: avoid derreferencing possible null

ff_all_channel_layouts() might return null on alloc failure.

Fixes CID1241518

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

Merge commit '7703995a2e8760e66ff35148bf029e0f9e30dbe6'

* commit '7703995a2e8760e66ff35148bf029e0f9e30dbe6':
  flac: Remove unused headers

Conflicts:
libavcodec/flacdec.c

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

Merge commit 'cc4992aaf3dbb0af88d9727983d75636baf1f8cc'

* commit 'cc4992aaf3dbb0af88d9727983d75636baf1f8cc':
  ac3enc: allow Dolby Pro Logic IIz as the Dolby Surround EX mode.

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

Merge commit '4c2fd4b262347273afe97865ba451a1abde43ae6'

* commit '4c2fd4b262347273afe97865ba451a1abde43ae6':
  ac3enc: allow Dolby Pro Logic II as a preferred downmix mode.

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

Merge commit 'b39ebcddd47daf37659796aaa7d068668086507a'

* commit 'b39ebcddd47daf37659796aaa7d068668086507a':
  fate: Add VC-1 interlaced twomv test

Note, this test is not free of artifacts on both sides of the merge

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

log: Unbreak no-tty support on 256color terminals

Merge commit 'a97328afef0ccebfc8c3d9f9fdb8e93cbf1058ab'

* commit 'a97328afef0ccebfc8c3d9f9fdb8e93cbf1058ab':
  vc1: Use logical instead of bitwise or for twomv

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

Merge commit 'b5fe13448b13bfdd48a75b7e12387e11e3526d7c'

* commit 'b5fe13448b13bfdd48a75b7e12387e11e3526d7c':
  vc1: Use logical instead of bitwise or for coded_inter

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

flac: Remove unused headers

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

ac3enc: allow Dolby Pro Logic IIz as the Dolby Surround EX mode.

This is actually defined in the A/52 specification.

ac3enc: allow Dolby Pro Logic II as a preferred downmix mode.

Some encoders already use this value even
though it's reserved in the A/52 specification.

fate: Add VC-1 interlaced twomv test

CC: libav-stable@libav.org

vc1: Use logical instead of bitwise or for twomv

CC: libav-stable@libav.org
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Tim Walker <tdskywalker@gmail.com>

vc1: Use logical instead of bitwise or for coded_inter

This appears to be the intended behavior.

libavformat/iff: print error message when DSDIFF compression type is not supported

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

avcodec/dxtory: remove unused variables

Found-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'b97f6ef956293fe06ae1e99bd295f42613081f37'

* commit 'b97f6ef956293fe06ae1e99bd295f42613081f37':
  pcm-dvd: Move a variable to a smaller scope

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

Merge commit '4d5b99dacdbb56373e5abe2ad35fc87b5c0c5bd2'

* commit '4d5b99dacdbb56373e5abe2ad35fc87b5c0c5bd2':
  caf: Give context structure a consistent name

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

lavd/avfoundation: Use microseconds as common timebase.

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

pcm-dvd: Move a variable to a smaller scope

This avoids an unused variable warning on big-endian systems.

avformat/srtdec: simpler and more lenient probing

Fixes Ticket #3935.

avformat: add SUP/PGS subtitle demuxer

Signed-off-by: Clément Bœsch <u@pkh.me>

caf: Give context structure a consistent name

lavd/avfoundation: Simplify debug message generation.

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

lavd/avfoundation: Using the actual stream index instead of hardcoded value.

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

lavd/avfoundation: Split adding a device and getting the device configuration into separate functions.

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

Autodetect jpg images.

Based on 2d3842f5 by Michael Niedermayer.

Fixes ticket #2541.

Support libopenjpeg 2.x via libopenmj2.

Based on a patch by Marius Cirsta.

Fixes ticket #2016.

Show correct pix_fmt for vp9 videos != AV_PIX_FMT_YUV420P.

avcodec/dxtory: Support dxtory-2.0.127.avi

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

lavc/x86/idctdsp.h: Fix make checkheaders.

avcodec/svq1enc: align buffer used by simd functions

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

x86/cavsdsp: fix buffer alignment in cavs_idct8_add_mmx()

It may be used by ff_add_pixels_clamped_sse2().
Should fix fate-cavs failures on some systems.

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

lavu/ffmpeg_opt: Check return value of avcodec_find_encoder().

Prevents a segfault if a stream featuring a known but unavailable codec (like external lib codec) should be opened.

Bug found by: Jonas Geistert <j.geistert@yahoo.de>

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

avformat/img2dec: enable generic seeking for image pipes

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

avformat/img2dec: initialize pkt->pos for image pipes

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

avformat/img2dec: pass error code and signal EOF

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

avformat/img2dec: fix error code at EOF for pipes

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

Merge commit '4620affa24eedb167482198aa04126bcedd05620'

* commit '4620affa24eedb167482198aa04126bcedd05620':
  m4vdec: K&R formatting cosmetics

Conflicts:
libavformat/m4vdec.c

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

Merge commit '86a361081d3eb4e999d75bc2a462f01d88cbd2e5'

* commit '86a361081d3eb4e999d75bc2a462f01d88cbd2e5':
  lmlm4: K&R formatting cosmetics

Conflicts:
libavformat/lmlm4.c

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

Merge commit '95d312d6c82e7485f43c3ddda0f369af0e41c83b'

* commit '95d312d6c82e7485f43c3ddda0f369af0e41c83b':
  concat: K&R formatting cosmetics

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

Merge commit '28f5cd312c9da9072108edf8b7685d009374ea96'

* commit '28f5cd312c9da9072108edf8b7685d009374ea96':
  fate: Switch ra4-288 test from framecrc() to pcm()

Conflicts:
tests/fate/real.mak

The test is kept disabled as it still does not pass on x86-64 due to float
rounding

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

Merge commit 'd07ddc93e29a4fdf12cd426953a7ecd5abe5e36d'

* commit 'd07ddc93e29a4fdf12cd426953a7ecd5abe5e36d':
  avcodec: Fix a doxy comment to refer to the right function

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

m4vdec: K&R formatting cosmetics

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

lmlm4: K&R formatting cosmetics

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

concat: K&R formatting cosmetics

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

fate: Switch ra4-288 test from framecrc() to pcm()

The decoder is float-based and the test needs to allow for some fuzz.

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

avcodec: Fix a doxy comment to refer to the right function

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

avcodec/mpegvideo_enc: write a log message at verbose level if frame re-encoding occurs due to VBV

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

x86/idctdsp: port {put,add}_pixels_clamped to yasm

Also add sse2 versions for both.
put_pixels_clamped port and sse2 version originally written by Timothy Gu.

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

avcodec/idctdsp: change {put,add}_pixels_clamped to ptrdiff_t line_size

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

Merge commit '2f172f1ae984b763c06069adb51d0053b3834f4b'

* commit '2f172f1ae984b763c06069adb51d0053b3834f4b':
  rtsp: Clear the session id on redirects

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

Merge commit 'ddf5fb71ee9c8b2d9a23c0f661a84896cd7050fc'

* commit 'ddf5fb71ee9c8b2d9a23c0f661a84896cd7050fc':
  rtpenc: HEVC/H.265 support

Conflicts:
Changelog
libavformat/rtpenc.c
libavformat/rtpenc_hevc.c
libavformat/version.h

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

Merge commit 'a2efbecc4ed12d287cf29856418c4da4a7648d95'

* commit 'a2efbecc4ed12d287cf29856418c4da4a7648d95':
  libavformat: Move avc mp4 startcode parsing to a shared file

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

avcodec/x86: use function pointers for {put,add}_pixels_clamped

Same behavior as in simple_idct.
This way the best optimized versions available will be used instead.

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

libavutil/opt: fix av_opt_set_channel_layout() to access correct memory address

Signed-off-by: Philip DeCamp <decamp@mit.edu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

rtsp: Clear the session id on redirects

This fixes handling redirects in case the server provided a session
id within the redirect reply.

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

rtpenc: HEVC/H.265 support

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

libavformat: Move avc mp4 startcode parsing to a shared file

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

x86/videodsp: add ff_emu_edge_{hfix,hvar}_avx2

~15% faster than sse2.

Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>

libavformat/ffmetadec: Make unchanged function arguments const

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

libavformat/dv: Make unchanged function arguments const

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

libavformat/avienc: Make unchanged function arguments const

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

libavformat/avidec: Make unchanged function arguments const

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

Merge commit 'c463dfc7e49929a9891884312b23b27d14729c51'

* commit 'c463dfc7e49929a9891884312b23b27d14729c51':
  rtpdec_hevc: Drop a duplicated, nonstandard entry

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

doc/APIchanges: fix typo

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

postproc: add basic deblock filter visualization support

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

ffplay: use av_codec_get_pkt_timebase()

Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

rtpdec_hevc: Drop a duplicated, nonstandard entry

The RFC spec draft only specifies the "H265" name - there is no
specification saying how to interpret "HEVC" (if such a packet
format is specified it could be an entirely different format).

Since this is a very new standard (still a draft), there is little
need for compatibility with existing, broken implementations. Therefore
remove the extra alias, to avoid the risk of encouraging incorrect
usage.

Intentionally keeping the ff_hevc_dynamic_handler name for the
handler, to use "hevc" consistently as name for the codec instead
of "h265" within the library internals as long as there only is one
single variant in actual use.

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

configure: Check if "-D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600" is needed for localtime_r()

Fixes build with musl

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

configure: fail if SDL is unavailable and --enable-sdl is specified

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

configure: reindent the --disable-sdl related code

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

configure: support --disable-sdl

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

hevc: move intermediate bidir buffer

Other buffers are already there.

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

hevc: remove unneeded buffer.

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

x86/videodsp: fix warning about discarded 'const' qualifier

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

avcodec/libvpxdec: don't check for formats other than i420 when vp9 decoding is disabled

Should fix ticket #3958.

Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: James Almer <jamrial@gmail.com>

tests/fate-run.sh: Cat .err file in case of error with V>0

This may make fate failures where only the console output is available
easier to analyze

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

Skip decklink_common_c.h when running make checkheaders.

Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: move pts calculating code to generic decoder
  ffplay: factorize decoder functions to generic decoder
  ffplay: handle fullscreen status on resize event

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

Fix compile error on arm4/arm5 platform

Since these commits
http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=adf8227cf4e7b4fccb2ad88e1e09b6dc00dd00ed
http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8

compilation on arm4/arm5 fails:

libavcodec/libavcodec.so: undefined reference to
`ff_startcode_find_candidate_armv6'

Because libavcodec/arm/Makefile contains
ARMV6-OBJS-$(CONFIG_STARTCODE)         += arm/startcode_armv6.o
function ff_startcode_find_candidate_armv6 is not included for older ARM
archs. The bug was found during automatic buildroot builds:

http://autobuild.buildroot.net/results/ec7/ec71e4f16ee9106747dff5f15999cbd17903e76f//build-end.log
Quote from configure summary:
ARCH                      arm (armv4t)
big-endian                no
runtime cpu detection     yes
ARMv5TE enabled           no
ARMv6 enabled             no
ARMv6T2 enabled           no

http://autobuild.buildroot.net/results/be7/be72eb182eaccf0064a32c9dfc2ac1c0d6555506/build-end.log
ARCH                      arm (armv5te)
big-endian                no
runtime cpu detection     yes
ARMv5TE enabled           yes
ARMv6 enabled             no
ARMv6T2 enabled           no

This patch provides the necessary #if clauses as discussed with Michael:
https://ffmpeg.org/pipermail/ffmpeg-devel/2014-September/163329.html

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ffplay: move pts calculating code to generic decoder

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

ffplay: factorize decoder functions to generic decoder

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

ffplay: handle fullscreen status on resize event

In some cases resize events can happen even during fullscreen, so let's pass
the proper flag to SDL_SetVideoMode.

Fixes ticket #3964.

Reported-by: Jeff Dwork <jeff@reggie.com>
Signed-off-by: Marton Balint <cus@passwd.hu>

avformat/riffenc: Filter out "BottomUp" in ff_put_bmp_header()

Fixes Ticket1304

Commit message and extradata size bugfix by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/webp: fix default palette color 0xff000000 -> 0x00000000

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

avcodec/asvenc: fix AAN scaling

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

avcodec/asvenc: Fix integer overflow in level

Warn if the qscale is too low for the input data and clip levels to
minimize artifacts

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

x86/vp9: add AVX and AVX2 MC

Roughly 25% faster MC than ssse3 for blocksizes 32 and 64.

Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>

ffmpeg: replace impossible dts/pts combinations by a reasonable guess instead of hard failing

Fixes stream copy from tserror270.ts

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

doc/decoders: adding documentation for lavc/dvdsubdec.c option "forced_subs_only"

Signed-off-by: Nicholas Robbins <nickrobbins@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/dvdsubdec: Add option forced_subs_only to only decode forced subtitle frames.

Signed-off-by: Nicholas Robbins <nickrobbins@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/asfenc: Make asf_write_indexs index argument const

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

avformat/adtsenc: buf isnt changed in adts_decode_extradata(), make it const

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

avcodec/4xm: Make src of decode_p_block() const

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

avcodec/snow: Make block argumrnt of ff_snow_pred_block() const

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

postproc/postprocess_template: mark unchanged function arguments const

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