Merge commit 'faa8245bd45c1a6dd220ba9407ea1c82132aa1ce'

* commit 'faa8245bd45c1a6dd220ba9407ea1c82132aa1ce':
  vf_lut: Constantize

Conflicts:
libavfilter/vf_lut.c

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

avcodec/pcm-dvd: discard buffer if block size changed

This prevents a potential crash

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

pcm-dvd: Fix build on big endian

Signed-off-by: Martin Storsjö <martin@martin.st>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'a42e3a6700547e4e49445bda81d3a89ec3e081a9'

* commit 'a42e3a6700547e4e49445bda81d3a89ec3e081a9':
  pcm_dvd: consolidate pieces from pcm.c and mpeg.c

Conflicts:
libavcodec/pcm.c
libavcodec/version.h
libavformat/mpeg.c

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

fate: update fate tests after master:291ad12ea2d1: ffprobe: show probe_score in the format section

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

ffprobe: show probe_score in the format section

Should address trac ticket #2621.

ffprobe: fix format section XML validation

It was broken since 2186a7e547fdda716138444c8345ce8b823f2d4a.

avcodec/h264: set er.ref_count earlier

Fixes Ticket2910

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

avcodec/error_resilience: change out commented printf() to av_log()

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

avformat/utils: fix duration_fields calculation when need_parsing=0

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

avformat/lxfdec: use a parser to parse video frame headers

lxf needs a parser (or would need to set a few fields explicitly).
Fixes Ticket2917

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

avcodec/utils: avcodec_string: print colorspace type

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

avcodec/utils: avcodec_string: Print color_range

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

avcodec/utils: avcodec_string: make the colorspace printing code more extendible.

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

vf_lut: Constantize

The pixel format tables are never modified, mark them as constant.

Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix make checkheaders for wavpackenc.h
  Fix make checkheaders for vdpau_internal.h

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  pcm_bluray: cosmetics

Conflicts:
libavcodec/pcm-bluray.c

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

Merge commit '0d6549d8b57aaa5be8efb794154cdbe9a645910f'

* commit '0d6549d8b57aaa5be8efb794154cdbe9a645910f':
  pcm_bluray: rename pcm-mpeg.c to pcm-bluray.c

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

Fix make checkheaders for wavpackenc.h

Fix make checkheaders for vdpau_internal.h

pcm_dvd: consolidate pieces from pcm.c and mpeg.c

Remove the header decoding for PCM audio from mpeg.c and the
20/24bit parts from pcm.c and merge them into a new decoder in
pcm-dvd.c.

The decoder has added support for samples that span multiple
packets and modified 20/24bit group decoding. Both is needed to
decode samples that have been generated with DVD-Lab Pro 2. The
decoding of 16bit PCM and two channel 24bit is identical to
before. No other samples are known to verify the correctness of
the encoding this software does.
The complete list of tested formats is
48kHz/16bit/2-8 channels
48kHz/24bit/2-5 channels
96kHz/16bit/2-4 channels
96kHz/24bit/2 channels

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

pcm_bluray: cosmetics

pcm_bluray: rename pcm-mpeg.c to pcm-bluray.c

The original idea was to collect PCM codecs that could appear in various
MPEG streams in this file. Discussion in IRC lead to the conclusion that
one codec per file would be better and stop the need for #ifdefs.

avformat/avidec: match first index and first packet size=0 handling

Fixes Ticket2861

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

avcodec/dsputil: fix signedness in sizeof() comparissions

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

avcodec/pngdsp: fix (un)signed type in end comparission

Fixes out of array accesses
Fixes Ticket2919

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

lavu/bprint: add append buffer function

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Reveiwed-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/avpacket: Use av_free_packet() in error cleanups

This prevents memleaks on errors
reproduceable with fate when error pathes are forced

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

vformat/subtitles: check av_copy_packets return code

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

kgv1dec: remove unused avctx from codec private context

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

kgv1dec: make decoder independent of sizeof(AVFrame)

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

wnv1: remove unused avctx from codec private context

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

avcodec/pngdec: fix last_row_size type

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

avcodec/pngdec: Fix padded alloc code with threads

Fixes Ticket2903
Fixes out of array write
no releases should be affected by this

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

Reinstate proper FFmpeg license for all files.

Fix compilation with --disable-mmx.

cmdutils: silence warning about incompatible pointer types

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

avcodec/mpegvideo: reduce log level for messages about allocating frames.

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

ffv1dec: Check bits_per_raw_sample and colorspace for equality in ver 0/1 headers

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ppc: don't return a value from a function declared void

See: 01a82f1dc544df7a4affb3858d12b7b2e492cbba

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

Merge commit 'e998b56362c711701b3daa34e7b956e7126336f4'

* commit 'e998b56362c711701b3daa34e7b956e7126336f4':
  x86: avcodec: Consistently structure CPU extension initialization

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

avcodec/x86/lpc: Fix cpu flag checks so they work

Broken by 6369ba3c9cc74becfaad2a8882dff3dd3e7ae3c0

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

avcodec/x86/vp8dsp: Fix cpu flag checks so they work

Broken by 6369ba3c9cc74becfaad2a8882dff3dd3e7ae3c0

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

Merge commit '6369ba3c9cc74becfaad2a8882dff3dd3e7ae3c0'

* commit '6369ba3c9cc74becfaad2a8882dff3dd3e7ae3c0':
  x86: avcodec: Use convenience macros to check for CPU flags

Conflicts:
libavcodec/x86/dsputil_init.c
libavcodec/x86/hpeldsp_init.c
libavcodec/x86/motion_est.c

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

Merge commit '79aec43ce813a3e270743ca64fa3f31fa43df80b'

* commit '79aec43ce813a3e270743ca64fa3f31fa43df80b':
  x86: Add and use more convenience macros to check CPU extension availability

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

ppc: don't return a value from a function declared void

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

Merge commit 'a6b650118543e1580e872896d8976042b7c32d01'

* commit 'a6b650118543e1580e872896d8976042b7c32d01':
  ppc: cosmetics: Consistently format CPU flag detection invocations

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

doc/encoders: reformat and add some clarification in libtwolame doc

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

doc/encoders: reformat libmp3lame doc

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

ffv1dec: check that global parameters dont change in version 0/1

Such changes are not allowed nor supported

Fixes Ticket2906

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

avcodec/ffv1dec: check global header version

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

avcodec/mpegvideo: Dont incorrectly warn about missing keyframes

Files starting with B frames in presentation order generated the
"no keyframe" warning before this change.

Based on patch by: Robert Krüger <krueger@lesspain.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ppc: don't return a value from a function declared void

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

snow: Check av_frame_alloc() failures

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

avcodec/snow: gray support

Fixes Ticket839

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

doc/snow: add gray/alpha/gbr

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

avcodec/utils: support non edge emu for grayscale

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

libavcodec/snow: change AVFrame to pointers to AVFrame for ABI stability

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

avcodec/snowenc: remove now unneeded include <assert.h>

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

avcodec/snowenc: convert all asserts to av_asserts

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

snowenc: remove disabled QUANTIZE2 code

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  cosmetics: Place arch initialization calls in alphabetical order

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

Merge commit 'f0389eb777b1ab4291329d4f709098cdfa7384dc'

* commit 'f0389eb777b1ab4291329d4f709098cdfa7384dc':
  arm: fmtconvert: Split armv6 fmtconvert code off from vfp code

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

Merge commit '7ffda66fd5c81af4725bff7c2c4f207ba2aa0613'

* commit '7ffda66fd5c81af4725bff7c2c4f207ba2aa0613':
  arm: float_dsp: Propagate cpu_flags to vfp initialization function

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

Merge commit 'bd549cbaacd33dfb7be81d0619c9b107b8a85be7'

* commit 'bd549cbaacd33dfb7be81d0619c9b107b8a85be7':
  arm: dcadsp: Move synth filter initialization to dcadsp file

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

Merge commit '1909f6b1b6da2db371c179bed5a19aaf979b7557'

* commit '1909f6b1b6da2db371c179bed5a19aaf979b7557':
  swscale: cosmetics: Drop silly camelCase from swScale function pointer name

Conflicts:
libswscale/swscale_unscaled.c

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

Merge commit '4e0799a4d04404abfa8fbc072640be76465158cf'

* commit '4e0799a4d04404abfa8fbc072640be76465158cf':
  swscale: Add some missing av_cold to arch-specific init functions

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

Merge commit '3aa682f25324d811ec284edc808eb71a46eae950'

* commit '3aa682f25324d811ec284edc808eb71a46eae950':
  swscale: consistent names for arch-specific acceleration functions

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

Merge commit 'c2503d9c8ab42ea55922e9f5a10c8bfbbbfeaf19'

* commit 'c2503d9c8ab42ea55922e9f5a10c8bfbbbfeaf19':
  swscale: ppc: Hide arch-specific initialization details

Conflicts:
libswscale/utils.c

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

Merge commit '6af2c351b3ae61e4478950ffddd0dfcad06188b8'

* commit '6af2c351b3ae61e4478950ffddd0dfcad06188b8':
  ppc: Add missing AltiVec cpuflag detection invocations

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

Merge commit 'de81b6ae4f38273ff27020f494cc46539110d34b'

* commit 'de81b6ae4f38273ff27020f494cc46539110d34b':
  ppc: fdct: Remove vim editor settings comment

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

Merge commit '70dd8892bf00923af838756dfbb356a9b1e4e40d'

* commit '70dd8892bf00923af838756dfbb356a9b1e4e40d':
  mpegvideo: Replace arch initialization ifdeffery by standard conditionals

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

Merge commit 'cd529172377229f2e86987869ccc08f426bfe114'

* commit 'cd529172377229f2e86987869ccc08f426bfe114':
  x86: rv40dsp: Move inline assembly optimizations out of YASM init section

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

Merge commit 'a519583991c38d38503ab08357716513facc5725'

* commit 'a519583991c38d38503ab08357716513facc5725':
  swscale: x86: Hide arch-specific initialization details

Conflicts:
libswscale/x86/Makefile
libswscale/x86/swscale.c

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

Merge commit 'a64f6a04ac5773aeff2003897455dadb9609f18b'

* commit 'a64f6a04ac5773aeff2003897455dadb9609f18b':
  dsputil: x86: Hide arch-specific initialization details

Conflicts:
libavcodec/x86/Makefile

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

Merge commit 'f61bece684d9685b07895508e6c1c733b5564ccf'

* commit 'f61bece684d9685b07895508e6c1c733b5564ccf':
  ppc: Add and use convenience macro to check for AltiVec availability

Conflicts:
libavcodec/ppc/dsputil_ppc.c

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

Merge commit '8410d6e93c2e074881f1c7b7e4cdefd2e497d52e'

* commit '8410d6e93c2e074881f1c7b7e4cdefd2e497d52e':
  avutil: Refactor CPU extension availability macros

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

Merge commit 'b78b10c4b78b696927f2801cf2d9f193b4eff28b'

* commit 'b78b10c4b78b696927f2801cf2d9f193b4eff28b':
  avutil: Move internal CPU detection function declarations to private header

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

Merge commit '91d4cfb8127f1de6c4ad173a30fffe584700046d'

* commit '91d4cfb8127f1de6c4ad173a30fffe584700046d':
  apedec: do not buffer decoded samples over AVPackets

Conflicts:
libavcodec/apedec.c

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

Merge commit '84146963d23d76b09af633e97413cd97d9b3021e'

* commit '84146963d23d76b09af633e97413cd97d9b3021e':
  configure: x86: Fix handling of i686 and cpunop features

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

Merge commit '6454c44f9f74dbaed17d32cf0eaec185386c27fa'

* commit '6454c44f9f74dbaed17d32cf0eaec185386c27fa':
  rtmpproto: Fix limelight authentication with abbreviated app names

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

avfilter/vf_fps: fix ABI compatibility with AV_NOPTS starttime

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

x86: avcodec: Consistently structure CPU extension initialization

x86: avcodec: Use convenience macros to check for CPU flags

x86: Add and use more convenience macros to check CPU extension availability

Merge commit 'cb8f70c96e14c1b4824ef23d21d78d10fc5a4b93'

* commit 'cb8f70c96e14c1b4824ef23d21d78d10fc5a4b93':
  vf_fps: use double constants for default/min/max for start_time

Conflicts:
libavfilter/vf_fps.c

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

truemotion2: check return value of av_malloc(z)

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

ppc: cosmetics: Consistently format CPU flag detection invocations

cosmetics: Place arch initialization calls in alphabetical order

arm: fmtconvert: Split armv6 fmtconvert code off from vfp code

arm: float_dsp: Propagate cpu_flags to vfp initialization function

arm: dcadsp: Move synth filter initialization to dcadsp file

swscale: cosmetics: Drop silly camelCase from swScale function pointer name

swscale: Add some missing av_cold to arch-specific init functions

swscale: consistent names for arch-specific acceleration functions

swscale: ppc: Hide arch-specific initialization details

Also give consistent names to init functions.

lavf/ftp: fix possible crash

avformat/utils: fix av_probe_input_buffer2() so it returns the probe score

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

ppc: Add missing AltiVec cpuflag detection invocations

doc/APIchanges: add missing entry for av_format_probe_score() function addition