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

doc/formats: remove probe_score entry, since it's not an option

ppc: fdct: Remove vim editor settings comment

mpegvideo: Replace arch initialization ifdeffery by standard conditionals

x86: rv40dsp: Move inline assembly optimizations out of YASM init section

swscale: x86: Hide arch-specific initialization details

Also give consistent names to init functions.

dsputil: x86: Hide arch-specific initialization details

Also give consistent names to init functions.

ppc: Add and use convenience macro to check for AltiVec availability

avutil: Refactor CPU extension availability macros

avutil: Move internal CPU detection function declarations to private header

avformat: export probe score

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

apedec: do not buffer decoded samples over AVPackets

Only consume an AVPacket when all the samples have been read.

When the rate of samples output is limited (by the default value
of max_samples), consuming the first packet immediately will cause
timing problems:

- The first packet with PTS 0 will output 4608 samples and be
consumed entirely
- The second packet with PTS 64 will output the remaining samples
(typically, a lot, that's why max_samples exist) until the decoded
samples of the first packet have been exhausted, at which point the
samples of the second packet will be decoded and output when
av_decode_frame is called with the next packet).

That means there's a PTS jump since the first packet is 'decoded'
immediately, which can be seen with avplay or mplayer: the timing
jumps immediately to 6.2s (which is the size of a packet).

Sample: http://streams.videolan.org/issues/6348/Goldwave-MAClib.ape
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>

snowenc: Fix memleak of the ratecontrol related memory

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

avcodec/snow: check for malloc* failures

Also return and pass on error codes where needed for this

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

configure: x86: Fix handling of i686 and cpunop features

The i686 feature really is a CPU feature and should be handled as such.
The cpunop dependency on i686 should be expressed with a standard _deps
declaration instead of a manual test.

rtmpproto: Fix limelight authentication with abbreviated app names

When streaming to limelight, the app name is either a full
"appname/subaccount" or "appname/_definst_". In the latter case,
the app name can be simplified into simply "appname", but the
authentication hashing assumes the /_definst_ still to be present.

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

vf_fps: use double constants for default/min/max for start_time

When using AV_NOPTS_VALUE (which expands to INT64_C(0x8000000000000000))
as union initializer for a double field, the c99 converter needs to
interpret this constant when filling the union initializer, and it is
interpreted as a positive value.

When converting AV_NOPTS_VALUE to a double, MSVC 2010 ends up with
the same positive value as the c99 converter, while MSVC 2012 gets
a negative value.

This results in an infite loop in various FATE tests on MSVC 2012.

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

snowenc: check for memory allocation failures

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc: document the asf demuxer

Conflicts:
doc/demuxers.texi

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

Merge commit '0ce1a7598e84abe6fb3684d0d5b0872d36f001d7'

* commit '0ce1a7598e84abe6fb3684d0d5b0872d36f001d7':
  vf_interlace: fix file permissions

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

Merge commit 'ef51692a49d58963966adca55c62da9c34c3c7e1'

* commit 'ef51692a49d58963966adca55c62da9c34c3c7e1':
  Revert "w32pthread: help compiler figure out undeeded code"

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

Merge commit '4332bf98dc051fd1ffbd9d4ddc1c5e55790c96f1'

* commit '4332bf98dc051fd1ffbd9d4ddc1c5e55790c96f1':
  w32threads: Don't use function pointers when linking directly to newer APIs

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

Merge commit '310cc4bf82824f09bdd0b9147ed725cdbeaf9bdd'

* commit '310cc4bf82824f09bdd0b9147ed725cdbeaf9bdd':
  smoothstreamingenc: Write to a temp file while updating the manifest

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

Merge commit 'b1f9cdc37ff5d5b391d2cd9af737ab4e5a0fc1c0'

* commit 'b1f9cdc37ff5d5b391d2cd9af737ab4e5a0fc1c0':
  ac3: Return proper error codes

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

Merge commit '818d1f1a3e89d35213af0bd5dc4a772713951882'

* commit '818d1f1a3e89d35213af0bd5dc4a772713951882':
  ac3: Clean up the error paths

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

Merge commit '6258d362b82934a2c27557e0984aed372d98091a'

* commit '6258d362b82934a2c27557e0984aed372d98091a':
  ac3: Do not clash with normal AVERROR

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

Merge commit 'f4634ae8a83d13a1abf3baac8956a3111aa09ed2'

* commit 'f4634ae8a83d13a1abf3baac8956a3111aa09ed2':
  flv: Fix the help string

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

Merge commit '21015109ec0fac0f104a5355f272ecb956ba3f4e'

* commit '21015109ec0fac0f104a5355f272ecb956ba3f4e':
  doc: Document the flv demuxer

Conflicts:
doc/demuxers.texi

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

Merge commit 'f812eeda17e38797df5cb733ce99cdfd829d84ca'

* commit 'f812eeda17e38797df5cb733ce99cdfd829d84ca':
  matroskaenc: Fix writing TRACKDEFAULTFLAG

Conflicts:
libavformat/matroskaenc.c
tests/fate/wavpack.mak
tests/ref/lavf/mkv
tests/ref/seek/lavf-mkv

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

doc: document the asf demuxer

And drop a typo from the previous FLV entry.

cmdutils: Filter non user AVOptions out from what can be set over the command line.

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

vf_interlace: fix file permissions

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

Revert "w32pthread: help compiler figure out undeeded code"

This reverts commit 4622f11f9c83db8a2e08408c71ff901826ca652c.

The compiler should be able to do the dead code elimination now
without this when the cond_* names point directly to the real
functions instead of to local function pointers.

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

w32threads: Don't use function pointers when linking directly to newer APIs

This reduces the call overhead slightly. More noticeably, it
restores the earlier (unintended?) feature that condition variable
functions work just fine even if w32thread_init() hasn't been called.
This was broken as a side effect of 4622f11f9, if explicitly targeting
Vista+.

This makes w32threading work in VP8 again, if targeting Vista+.

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

smoothstreamingenc: Write to a temp file while updating the manifest

If a client tries to read the file while it's being updated, the client
would get an incomplete manifest. Instead write to a separate temp file
and atomically rename it to replace the previous one.

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