Merge commit '8e329dba378cef0ff6400c7df9c51da167d5a1f0'

* commit '8e329dba378cef0ff6400c7df9c51da167d5a1f0':
  riff: check for eof if chunk size and code are 0

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

Merge commit '1c88617b9421c9af8ae961c05d2381b19c585026'

* commit '1c88617b9421c9af8ae961c05d2381b19c585026':
  riff: K&R formatting cosmetics

Conflicts:
libavformat/riff.c

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

indeo4: implement haar 8x1 and 1x8 transforms

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

lavfi/fade: Added ability to do video fade based on timestamp

ismindex: check mkdir()s return code

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

tools/ismindex: dont ignore return code of write_fragments()

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

ffplay: check av_samples_get_buffer_size() return

Fixes CID1005310
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavfi: add interleave filters

riff: check for eof if chunk size and code are 0

Prevent an infinite loop.

Inspired by a patch from Michael Niedermayer

CC: libav-stable@libav.org
Signed-off-by: Diego Biurrun <diego@biurrun.de>

riff: K&R formatting cosmetics

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

lavfi/sendcmd: drop now pointless sendcmd/asendcmd_init() wrappers

lavfi/sendcmd: fix various "in in" rerepepetitions in messages

lavfi/buffersink: fix possible leaks after allocation failures.

Should fix Coverity CID 1005313, 1005314, 1005315.

lavfi: add asetrate filter.

ffmpeg_filter: fix leak on error

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

init_vlc_sparse: fix leak on error

Fixes CID1005312

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

libavfilter/af_atempo: Avoid round-off error build-up, ticket #2484

Current method for constraining fragment position drift suffers from
round-off error build up.

Instead of calculating cumulative drift as a sum of input fragment
position corrections, it is more accurate to calculate drift as the
difference between current fragment position and the ideal position
specified by the tempo scale factor.

Signed-off-by: Pavel Koshevoy <pkoshevoy@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

libavfilter/af_atempo: Fix uninitialized memory access

valgrind reported uninitialized memory access which was caused by
incorrect number of samples being passed to push_samples(..)

Signed-off-by: Pavel Koshevoy <pkoshevoy@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ppc: hpeldsp: Include attributes.h

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

qdm2: initialize coeff_per_sb_select from bit_rate

The value of coeff_per_sb_select depends on the bit rate, not on
sub_sampling.
Also remove the calculation of tmp, no longer needed.

Fixes tickets #1868 and #742 (only audio part)

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

mxf_timestamp_to_str: dont leave uninitilaized fields in time.

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

av_samples_alloc_array_and_samples: Fix sizeof type.

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

Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: only do early frame drop if video queue is not empty
  ffplay: use AV_NOPTS_VALUE video frame pts instead of using 0
  ffplay: simplify aspect ratio calculation

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

avcodec/mpegvideo: change asserts to av_asserts

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

avfilter/deshake_kernel: fix reset value bug of deshake kernel

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavfi/stereo3d: support more formats for non-anaglyph outputs

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

ffplay: only do early frame drop if video queue is not empty

Fixes ticket #2446.

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

ffplay: use AV_NOPTS_VALUE video frame pts instead of using 0

Assuming 0 pts may lead to bad framedrop decisions...

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

ffplay: simplify aspect ratio calculation

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: Remove unused inline asm instruction defines
  vc1: Remove now unused variables

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

Merge commit '287c8db39e71af7047e551bbfd1264d771cccbc9'

* commit '287c8db39e71af7047e551bbfd1264d771cccbc9':
  cosmetics: bfin: Fix indentation in the dsputil init function

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

Merge commit 'd4d186d185df98492d8935a87c5b5cf369db9748'

* commit 'd4d186d185df98492d8935a87c5b5cf369db9748':
  dsputil: Remove non-8bpp draw_edge

Conflicts:
libavcodec/dsputil.c

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

Merge commit 'c9f5fcd08c3a33bfb1b473705c792ab051e7428d'

* commit 'c9f5fcd08c3a33bfb1b473705c792ab051e7428d':
  dsputil: Merge 9-10 bpp functions for get_pixels and draw_edge

Conflicts:
libavcodec/dsputil.c

No difference as this has been part of ffmpeg since a while and
the rebased commit does also not introduce new changes.

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

Merge commit '619e0da19119bcd683f135fe9a164f37c0ca70d1'

* commit '619e0da19119bcd683f135fe9a164f37c0ca70d1':
  dsputil: Remove unused 32-bit functions

Conflicts:
libavcodec/dsputil.c
libavcodec/dsputil_template.c

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

Merge commit 'c443117f25e034c1e3ef35334b61b937e1e208ff'

* commit 'c443117f25e034c1e3ef35334b61b937e1e208ff':
  dsputil: Remove dct_bits

Conflicts:
libavcodec/dsputil.c
libavcodec/h264.c

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

ppc: hpeldsp: Include attributes.h

This fixes building in configurations where altivec is disabled.

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

Merge commit '54cd5e4f92de6bd0fb8e24069153b0156c8136bc'

* commit '54cd5e4f92de6bd0fb8e24069153b0156c8136bc':
  dsputil: Remove hpel functions (moved to hpeldsp)

Conflicts:
libavcodec/hpeldsp.h

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

Merge commit '2957d29f0531ccd8a6f4378293424dfd92db3044'

* commit '2957d29f0531ccd8a6f4378293424dfd92db3044':
  alpha: hpeldsp: Move half-pel assembly from dsputil to hpeldsp

Conflicts:
libavcodec/alpha/dsputil_alpha.c
libavcodec/alpha/hpeldsp_alpha.c
libavcodec/alpha/hpeldsp_alpha.h
libavcodec/alpha/hpeldsp_alpha_asm.S
libavcodec/hpeldsp.h

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

Merge commit '78ce568e43a7f3993c33100aa8f5d56c4c4bd493'

* commit '78ce568e43a7f3993c33100aa8f5d56c4c4bd493':
  sparc: hpeldsp: Move vis half-pel assembly from dsputil to hpeldsp

Conflicts:
libavcodec/hpeldsp.h
libavcodec/sparc/dsputil_vis.c
libavcodec/sparc/hpeldsp_vis.c

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

Merge commit '278bd2054ca61ab70dfe38f1774409cda2da5359'

* commit '278bd2054ca61ab70dfe38f1774409cda2da5359':
  sh4: hpeldsp: Move half-pel assembly from dsputil to hpeldsp

Conflicts:
libavcodec/hpeldsp.c
libavcodec/hpeldsp.h
libavcodec/sh4/dsputil_align.c
libavcodec/sh4/dsputil_sh4.h
libavcodec/sh4/hpeldsp.c

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

Merge commit 'bfb41b5039e36b7f873d6ea7d24b31bf3e1a8075'

* commit 'bfb41b5039e36b7f873d6ea7d24b31bf3e1a8075':
  bfin: hpeldsp: Move half-pel assembly from dsputil to hpeldsp

Conflicts:
libavcodec/bfin/Makefile
libavcodec/bfin/hpel_pixels_bfin.S
libavcodec/bfin/hpeldsp_bfin.c
libavcodec/bfin/hpeldsp_bfin.h
libavcodec/hpeldsp.h

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

Merge commit '7384b7a71338d960e421d6dc3d77da09b0a442cb'

* commit '7384b7a71338d960e421d6dc3d77da09b0a442cb':
  arm: hpeldsp: Move half-pel assembly from dsputil to hpeldsp

Conflicts:
libavcodec/arm/Makefile
libavcodec/arm/hpeldsp_arm.S
libavcodec/arm/hpeldsp_arm.h
libavcodec/arm/hpeldsp_armv6.S
libavcodec/arm/hpeldsp_init_arm.c
libavcodec/arm/hpeldsp_init_armv6.c
libavcodec/arm/hpeldsp_init_neon.c
libavcodec/arm/hpeldsp_neon.S
libavcodec/hpeldsp.h

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

Merge commit '47e5a98174eb9c07ad17be71df129719d60ec8b7'

* commit '47e5a98174eb9c07ad17be71df129719d60ec8b7':
  ppc: hpeldsp: Move half-pel assembly from dsputil to hpeldsp

Conflicts:
libavcodec/hpeldsp.h
libavcodec/ppc/hpeldsp_altivec.c

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

Merge commit '8db00081a37d5b7e23918ee500bb16bc59b57197'

* commit '8db00081a37d5b7e23918ee500bb16bc59b57197':
  x86: hpeldsp: Move half-pel assembly from dsputil to hpeldsp

Conflicts:
libavcodec/hpeldsp.c
libavcodec/hpeldsp.h
libavcodec/x86/Makefile
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/hpeldsp_init.c
libavcodec/x86/hpeldsp_rnd_template.c

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

Merge commit '28bc406c84b04a5f1458b90ff52ddbec73e46202'

* commit '28bc406c84b04a5f1458b90ff52ddbec73e46202':
  mjpeg: Use hpeldsp instead of dsputil for half-pel functions
  svq1enc: Use hpeldsp instead of dsputil for half-pel functions

Conflicts:
configure
libavcodec/mjpegdec.c
libavcodec/svq1enc.c

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

Merge commit '2f6bc5f7c193477c2ebc0acce8f2d5551445e129'

* commit '2f6bc5f7c193477c2ebc0acce8f2d5551445e129':
  svq3: Use hpeldsp instead of dsputil for half-pel functions
  mpegvideo: Use hpeldsp instead of dsputil for half-pel functions
  svq1: Use hpeldsp instead of dsputil for half-pel functions
  mimic: Use hpeldsp instead of dsputil for half-pel functions

Conflicts:
configure
libavcodec/motion_est.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h

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

Merge commit '8071264f2196d71ff49c3944c33f8d3d83f548f1'

* commit '8071264f2196d71ff49c3944c33f8d3d83f548f1':
  interplayvideo: Use hpeldsp instead of dsputil for half-pel functions
  bink: Use hpeldsp instead of dsputil for half-pel functions
  indeo3: Use hpeldsp instead of dsputil for half-pel functions
  vp56: Use hpeldsp instead of dsputil for half-pel functions
  vp3: Use hpeldsp instead of dsputil for half-pel functions

Conflicts:
libavcodec/bink.c
libavcodec/indeo3.c
libavcodec/vp56.c

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

Merge commit '68d8238cca52e50e8cc81bf2edcaf8088c52d4c0'

* commit '68d8238cca52e50e8cc81bf2edcaf8088c52d4c0':
  hpeldsp: Add half-pel functions (currently copies of dsputil)

Conflicts:
libavcodec/hpeldsp.c
libavcodec/hpeldsp.h
libavcodec/hpeldsp_template.c

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

vc1dec: Fix tff == 0 handling in init_block_index()

This fixes several files from VLC ticket5887

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

vc1dec: Fix non pullup tff

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

h264: remove unused variable

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

lavf/gif: add final_delay option.

lavf/gifdec: add loop support.

Loop is ignored by default.

lavc/gif: miscellaneous cosmetics.

Changelog: notify GIF improvements.

doc/general: animated GIF are now compressed.

lavc/gif: add flag to enable transparency detection between frames.

While this is not always optimal, in practice most of the common cases are.

  ffmpeg -i big_buck_bunny_1080p_h264.mov -ss 45 -vf scale=320:160 -gifflags -transdiff -frames:v 50 -y bbb-notrans.gif
  ffmpeg -i big_buck_bunny_1080p_h264.mov -ss 45 -vf scale=320:160 -gifflags +transdiff -frames:v 50 -y bbb-trans.gif

  -rw-r--r-- 1 ubitux ubitux 1.1M Apr 19 19:00 bbb-notrans.gif
  -rw-r--r-- 1 ubitux ubitux 378K Apr 19 19:00 bbb-trans.gif

lavc/gif: make possible to disable offsetting.

x86: Remove unused inline asm instruction defines

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

vc1: Remove now unused variables

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: cosmetics: More sensible order for entries in video filter file

Conflicts:
tests/fate/filter-video.mak

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

Merge commit 'a77aed142cade3beb0cd43f879d4f47daae23b8a'

* commit 'a77aed142cade3beb0cd43f879d4f47daae23b8a':
  fate: Rename video filters file and add separate video filters target

Conflicts:
tests/fate/filter-video.mak

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

Merge commit 'b357f1d1d3dd1d6672df6a397a31be425d31b6d1'

* commit 'b357f1d1d3dd1d6672df6a397a31be425d31b6d1':
  fate: Split audio filters into their own separate file

Conflicts:
tests/Makefile
tests/fate/filter.mak

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

Merge commit '3eec1d41b4a947ba497f528e68da14a8befb85b9'

* commit '3eec1d41b4a947ba497f528e68da14a8befb85b9':
  fate: Reuse VREF and AREF variables where appropriate

Conflicts:
tests/fate/filter.mak
tests/fate/video.mak

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

Merge commit '5e83d9aced2fc2b2e1360452794c58aba55d497c'

* commit '5e83d9aced2fc2b2e1360452794c58aba55d497c':
  h264: fully support cropping.

Conflicts:
doc/APIchanges
libavcodec/h264.c
libavcodec/h264_ps.c
libavcodec/options_table.h
libavcodec/version.h

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

cosmetics: bfin: Fix indentation in the dsputil init function

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

dsputil: Remove non-8bpp draw_edge

It is never used.

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

dsputil: Merge 9-10 bpp functions for get_pixels and draw_edge

These only care about pixel storage unit size, not actual bits
used (i.e. they don't clip).

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

dsputil: Remove unused 32-bit functions

Previously, if dct_bits was set to 32, we used separate 32-bit
versions of these functions. Since dct_bits now is removed,
remove the unused 32-bit versions of the functions.

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

dsputil: Remove dct_bits

dct_bits is never set except in h264, where it is never used,
thus remove it.

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

dsputil: Remove hpel functions (moved to hpeldsp)

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

alpha: hpeldsp: Move half-pel assembly from dsputil to hpeldsp

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

sparc: hpeldsp: Move vis half-pel assembly from dsputil to hpeldsp

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

sh4: hpeldsp: Move half-pel assembly from dsputil to hpeldsp

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

bfin: hpeldsp: Move half-pel assembly from dsputil to hpeldsp

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

arm: hpeldsp: Move half-pel assembly from dsputil to hpeldsp

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

ppc: hpeldsp: Move half-pel assembly from dsputil to hpeldsp

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

x86: hpeldsp: Move half-pel assembly from dsputil to hpeldsp

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

mjpeg: Use hpeldsp instead of dsputil for half-pel functions

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

svq1enc: Use hpeldsp instead of dsputil for half-pel functions

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

svq3: Use hpeldsp instead of dsputil for half-pel functions

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

mpegvideo: Use hpeldsp instead of dsputil for half-pel functions

This also converts vc1, since that is mpegvideo-based.

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

svq1: Use hpeldsp instead of dsputil for half-pel functions

This makes svq1 independent of dsputil.

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

mimic: Use hpeldsp instead of dsputil for half-pel functions

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

interplayvideo: Use hpeldsp instead of dsputil for half-pel functions

This makes interplayvideo independent of dsputil.

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

bink: Use hpeldsp instead of dsputil for half-pel functions

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

indeo3: Use hpeldsp instead of dsputil for half-pel functions

This makes the Indeo 3 decoder independent of dsputil.

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

vp56: Use hpeldsp instead of dsputil for half-pel functions

This makes vp5 and vp6 independent of dsputil.

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

vp3: Use hpeldsp instead of dsputil for half-pel functions

This makes vp3 independent of dsputil.

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

hpeldsp: Add half-pel functions (currently copies of dsputil)

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

avcodec: Fix lowres handling in buffer allocation

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

Merge commit 'a7f46586bf47174b5fa00a905b767b1781ec8b72'

* commit 'a7f46586bf47174b5fa00a905b767b1781ec8b72':
  ff_get_buffer(): allocate the frame for max(coded,display) dimensions

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

Merge commit '505642f18276aed03278ac91b1f334ea888eac6a'

* commit '505642f18276aed03278ac91b1f334ea888eac6a':
  mp3dec: fallback to generic seeking when a TOC is not present

Conflicts:
libavformat/mp3dec.c

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

fate: cosmetics: More sensible order for entries in video filter file

fate: Rename video filters file and add separate video filters target

fate: Split audio filters into their own separate file

fate: Reuse VREF and AREF variables where appropriate

avformat: change seeking index consistency asserts to av_asserts

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

avcodec/mpegvideo_motion: Use a field from the current frame if the last is unavailable in DMV & 16x8

Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavf/http: remove duplicated dec flag.