ffmpeg.git
6 years agoMerge commit 'b4ad7c54c878dead7dfa4838b912a530c1debe85'
Michael Niedermayer [Mon, 22 Apr 2013 16:37:39 +0000 (18:37 +0200)]
Merge commit 'b4ad7c54c878dead7dfa4838b912a530c1debe85'

* commit 'b4ad7c54c878dead7dfa4838b912a530c1debe85':
  x86: cavs: Refactor duplicate dspfunc macro

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'a0d5ca4f0a8e2c34d784d503a12af6303424ac6a'
Michael Niedermayer [Mon, 22 Apr 2013 16:33:33 +0000 (18:33 +0200)]
Merge commit 'a0d5ca4f0a8e2c34d784d503a12af6303424ac6a'

* commit 'a0d5ca4f0a8e2c34d784d503a12af6303424ac6a':
  mxfenc: Use correct printf format specifier for int64_t
  h264: Drop unused variable

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '78fa0bd0f7067868943c0899907e313414492426'
Michael Niedermayer [Mon, 22 Apr 2013 16:28:59 +0000 (18:28 +0200)]
Merge commit '78fa0bd0f7067868943c0899907e313414492426'

* commit '78fa0bd0f7067868943c0899907e313414492426':
  x86: cavs: Put mmx-specific code into its own init function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavu/opencl:optimize compile kernel operation
highgod0401 [Mon, 22 Apr 2013 02:10:54 +0000 (10:10 +0800)]
lavu/opencl:optimize compile kernel operation

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: re-enable af_join test
Michael Niedermayer [Mon, 22 Apr 2013 11:13:03 +0000 (13:13 +0200)]
fate: re-enable af_join test

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi: remove mp=down3dright
Paul B Mahol [Wed, 17 Apr 2013 12:31:41 +0000 (12:31 +0000)]
lavfi: remove mp=down3dright

Same funcionality is provided by stereo3d=ab[2]{l,r}:sbs[2]{l,r}.
Additional "features" are barely useful and cause crash or artifacts.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agodoc/filters: add examples for stereo3d
Paul B Mahol [Mon, 22 Apr 2013 10:15:14 +0000 (10:15 +0000)]
doc/filters: add examples for stereo3d

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 22 Apr 2013 11:07:12 +0000 (13:07 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: Remove some duplicate function declarations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '9bfc6e02bae9de354fb9ba09a8a140e83eeadf7d'
Michael Niedermayer [Mon, 22 Apr 2013 11:02:20 +0000 (13:02 +0200)]
Merge commit '9bfc6e02bae9de354fb9ba09a8a140e83eeadf7d'

* commit '9bfc6e02bae9de354fb9ba09a8a140e83eeadf7d':
  afifo: fix request_samples on the last frame in certain cases

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b845f5e97b655de0a191f736594777fec9754cf5'
Michael Niedermayer [Mon, 22 Apr 2013 10:53:58 +0000 (12:53 +0200)]
Merge commit 'b845f5e97b655de0a191f736594777fec9754cf5'

* commit 'b845f5e97b655de0a191f736594777fec9754cf5':
  riff: Factor out WAVEFORMATEX parsing

Conflicts:
libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '516089d5d86b6809a9458f9cf171f2bc9a8e2a25'
Michael Niedermayer [Mon, 22 Apr 2013 10:40:56 +0000 (12:40 +0200)]
Merge commit '516089d5d86b6809a9458f9cf171f2bc9a8e2a25'

* commit '516089d5d86b6809a9458f9cf171f2bc9a8e2a25':
  riff: Add ACTRAC3+ guid

No change, this commit was in ffmpeg already with this formating

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'a3bf80a5aea577663354bd538e345b283bcb73de'
Michael Niedermayer [Mon, 22 Apr 2013 10:36:29 +0000 (12:36 +0200)]
Merge commit 'a3bf80a5aea577663354bd538e345b283bcb73de'

* commit 'a3bf80a5aea577663354bd538e345b283bcb73de':
  riff: Perform full lookup on WAVEFORMATEXTENSIBLE subformat guid

Conflicts:
libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e544782623caf1eb4b2429e9c4f35d6b627accba'
Michael Niedermayer [Mon, 22 Apr 2013 10:04:10 +0000 (12:04 +0200)]
Merge commit 'e544782623caf1eb4b2429e9c4f35d6b627accba'

* commit 'e544782623caf1eb4b2429e9c4f35d6b627accba':
  riff: Move guid structs and helper functions into riff

Conflicts:
libavformat/asf.h
libavformat/riff.c
libavformat/wtv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86: cavs: Refactor duplicate dspfunc macro
Diego Biurrun [Sat, 20 Apr 2013 20:13:01 +0000 (22:13 +0200)]
x86: cavs: Refactor duplicate dspfunc macro

6 years agomxfenc: Use correct printf format specifier for int64_t
Diego Biurrun [Mon, 22 Apr 2013 02:50:45 +0000 (04:50 +0200)]
mxfenc: Use correct printf format specifier for int64_t

libavformat/mxfenc.c:1861:9: warning: format '%lld' expects argument of type 'long long int', but argument 5 has type 'int64_t' [-Wformat]

6 years agoh264: Drop unused variable
Diego Biurrun [Mon, 22 Apr 2013 00:53:58 +0000 (02:53 +0200)]
h264: Drop unused variable

6 years agoMerge commit '8e329dba378cef0ff6400c7df9c51da167d5a1f0'
Michael Niedermayer [Mon, 22 Apr 2013 09:07:50 +0000 (11:07 +0200)]
Merge commit '8e329dba378cef0ff6400c7df9c51da167d5a1f0'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1c88617b9421c9af8ae961c05d2381b19c585026'
Michael Niedermayer [Mon, 22 Apr 2013 08:50:05 +0000 (10:50 +0200)]
Merge commit '1c88617b9421c9af8ae961c05d2381b19c585026'

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

Conflicts:
libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86: cavs: Put mmx-specific code into its own init function
Diego Biurrun [Sat, 20 Apr 2013 20:03:19 +0000 (22:03 +0200)]
x86: cavs: Put mmx-specific code into its own init function

Before, this code was labeled as mmxext and enabled both for the
3dnow and the mmxext case.

6 years agox86: Remove some duplicate function declarations
Diego Biurrun [Sat, 20 Apr 2013 18:27:47 +0000 (20:27 +0200)]
x86: Remove some duplicate function declarations

6 years agoafifo: fix request_samples on the last frame in certain cases
Anton Khirnov [Tue, 16 Apr 2013 19:53:56 +0000 (21:53 +0200)]
afifo: fix request_samples on the last frame in certain cases

The current code can fail to return the last frame if it contains
exactly the requested number of samples.

Fixes the join filter test, which previously did not include the last
408 samples in most cases.

CC:libav-stable@libav.org

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoindeo4: implement haar 8x1 and 1x8 transforms
Michael Niedermayer [Mon, 22 Apr 2013 00:24:08 +0000 (02:24 +0200)]
indeo4: implement haar 8x1 and 1x8 transforms

Fixes Ticket1984
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/fade: Added ability to do video fade based on timestamp
Andy Martin [Wed, 17 Apr 2013 01:35:02 +0000 (21:35 -0400)]
lavfi/fade: Added ability to do video fade based on timestamp

6 years agoismindex: check mkdir()s return code
Michael Niedermayer [Sun, 21 Apr 2013 17:53:18 +0000 (19:53 +0200)]
ismindex: check mkdir()s return code

Fixes CID733724
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotools/ismindex: dont ignore return code of write_fragments()
Michael Niedermayer [Sun, 21 Apr 2013 17:49:22 +0000 (19:49 +0200)]
tools/ismindex: dont ignore return code of write_fragments()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffplay: check av_samples_get_buffer_size() return
Michael Niedermayer [Sun, 21 Apr 2013 13:55:04 +0000 (15:55 +0200)]
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>
6 years agolavfi: add interleave filters
Stefano Sabatini [Mon, 8 Apr 2013 13:16:06 +0000 (15:16 +0200)]
lavfi: add interleave filters

6 years agoriff: Factor out WAVEFORMATEX parsing
Luca Barbato [Sat, 20 Apr 2013 11:36:48 +0000 (13:36 +0200)]
riff: Factor out WAVEFORMATEX parsing

Makes the code simpler to follow.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoriff: Add ACTRAC3+ guid
Peter Ross [Sat, 20 Apr 2013 11:36:47 +0000 (13:36 +0200)]
riff: Add ACTRAC3+ guid

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoriff: Perform full lookup on WAVEFORMATEXTENSIBLE subformat guid
Peter Ross [Sat, 20 Apr 2013 11:36:46 +0000 (13:36 +0200)]
riff: Perform full lookup on WAVEFORMATEXTENSIBLE subformat guid

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoriff: Move guid structs and helper functions into riff
Peter Ross [Sat, 20 Apr 2013 11:36:45 +0000 (13:36 +0200)]
riff: Move guid structs and helper functions into riff

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoriff: check for eof if chunk size and code are 0
Luca Barbato [Sat, 20 Apr 2013 11:36:44 +0000 (13:36 +0200)]
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>
6 years agoriff: K&R formatting cosmetics
Luca Barbato [Sat, 20 Apr 2013 11:36:43 +0000 (13:36 +0200)]
riff: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agolavfi/sendcmd: drop now pointless sendcmd/asendcmd_init() wrappers
Stefano Sabatini [Sun, 21 Apr 2013 11:39:06 +0000 (13:39 +0200)]
lavfi/sendcmd: drop now pointless sendcmd/asendcmd_init() wrappers

6 years agolavfi/sendcmd: fix various "in in" rerepepetitions in messages
Stefano Sabatini [Sun, 21 Apr 2013 11:35:29 +0000 (13:35 +0200)]
lavfi/sendcmd: fix various "in in" rerepepetitions in messages

6 years agolavfi/buffersink: fix possible leaks after allocation failures.
Nicolas George [Sun, 21 Apr 2013 13:33:18 +0000 (15:33 +0200)]
lavfi/buffersink: fix possible leaks after allocation failures.

Should fix Coverity CID 1005313, 1005314, 1005315.

6 years agolavfi: add asetrate filter.
Nicolas George [Thu, 18 Apr 2013 14:59:27 +0000 (16:59 +0200)]
lavfi: add asetrate filter.

6 years agoffmpeg_filter: fix leak on error
Michael Niedermayer [Sun, 21 Apr 2013 09:59:34 +0000 (11:59 +0200)]
ffmpeg_filter: fix leak on error

Fixes: CID1005311
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoinit_vlc_sparse: fix leak on error
Michael Niedermayer [Sun, 21 Apr 2013 09:55:19 +0000 (11:55 +0200)]
init_vlc_sparse: fix leak on error

Fixes CID1005312

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavfilter/af_atempo: Avoid round-off error build-up, ticket #2484
Pavel Koshevoy [Sun, 21 Apr 2013 03:34:25 +0000 (21:34 -0600)]
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>
6 years agolibavfilter/af_atempo: Fix uninitialized memory access
Pavel Koshevoy [Sun, 21 Apr 2013 03:33:55 +0000 (21:33 -0600)]
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>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 21 Apr 2013 07:53:49 +0000 (09:53 +0200)]
Merge remote-tracking branch 'qatar/master'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoqdm2: initialize coeff_per_sb_select from bit_rate
Roberto Togni [Sat, 20 Apr 2013 21:57:18 +0000 (23:57 +0200)]
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>
6 years agomxf_timestamp_to_str: dont leave uninitilaized fields in time.
Michael Niedermayer [Sat, 20 Apr 2013 22:12:14 +0000 (00:12 +0200)]
mxf_timestamp_to_str: dont leave uninitilaized fields in time.

Fixes CID1005318
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoav_samples_alloc_array_and_samples: Fix sizeof type.
Michael Niedermayer [Sat, 20 Apr 2013 20:55:47 +0000 (22:55 +0200)]
av_samples_alloc_array_and_samples: Fix sizeof type.

Fixes CID1005317
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Sat, 20 Apr 2013 20:00:58 +0000 (22:00 +0200)]
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>
6 years agoavcodec/mpegvideo: change asserts to av_asserts
Michael Niedermayer [Sat, 20 Apr 2013 19:26:17 +0000 (21:26 +0200)]
avcodec/mpegvideo: change asserts to av_asserts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/deshake_kernel: fix reset value bug of deshake kernel
highgod0401 [Sat, 20 Apr 2013 03:21:08 +0000 (11:21 +0800)]
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>
6 years agolavfi/stereo3d: support more formats for non-anaglyph outputs
Paul B Mahol [Sat, 20 Apr 2013 14:25:17 +0000 (14:25 +0000)]
lavfi/stereo3d: support more formats for non-anaglyph outputs

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoffplay: only do early frame drop if video queue is not empty
Marton Balint [Tue, 16 Apr 2013 18:34:28 +0000 (20:34 +0200)]
ffplay: only do early frame drop if video queue is not empty

Fixes ticket #2446.

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: use AV_NOPTS_VALUE video frame pts instead of using 0
Marton Balint [Mon, 15 Apr 2013 20:12:18 +0000 (22:12 +0200)]
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>
6 years agoffplay: simplify aspect ratio calculation
Marton Balint [Mon, 15 Apr 2013 20:03:19 +0000 (22:03 +0200)]
ffplay: simplify aspect ratio calculation

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 20 Apr 2013 14:24:07 +0000 (16:24 +0200)]
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>
6 years agoMerge commit '287c8db39e71af7047e551bbfd1264d771cccbc9'
Michael Niedermayer [Sat, 20 Apr 2013 14:19:51 +0000 (16:19 +0200)]
Merge commit '287c8db39e71af7047e551bbfd1264d771cccbc9'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd4d186d185df98492d8935a87c5b5cf369db9748'
Michael Niedermayer [Sat, 20 Apr 2013 14:07:20 +0000 (16:07 +0200)]
Merge commit 'd4d186d185df98492d8935a87c5b5cf369db9748'

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

Conflicts:
libavcodec/dsputil.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c9f5fcd08c3a33bfb1b473705c792ab051e7428d'
Michael Niedermayer [Sat, 20 Apr 2013 14:03:32 +0000 (16:03 +0200)]
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>
6 years agoMerge commit '619e0da19119bcd683f135fe9a164f37c0ca70d1'
Michael Niedermayer [Sat, 20 Apr 2013 13:55:29 +0000 (15:55 +0200)]
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>
6 years agoMerge commit 'c443117f25e034c1e3ef35334b61b937e1e208ff'
Michael Niedermayer [Sat, 20 Apr 2013 13:43:33 +0000 (15:43 +0200)]
Merge commit 'c443117f25e034c1e3ef35334b61b937e1e208ff'

* commit 'c443117f25e034c1e3ef35334b61b937e1e208ff':
  dsputil: Remove dct_bits

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoppc: hpeldsp: Include attributes.h
Martin Storsjö [Fri, 19 Apr 2013 22:29:17 +0000 (01:29 +0300)]
ppc: hpeldsp: Include attributes.h

This fixes building in configurations where altivec is disabled.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoMerge commit '54cd5e4f92de6bd0fb8e24069153b0156c8136bc'
Michael Niedermayer [Sat, 20 Apr 2013 13:36:23 +0000 (15:36 +0200)]
Merge commit '54cd5e4f92de6bd0fb8e24069153b0156c8136bc'

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

Conflicts:
libavcodec/hpeldsp.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '2957d29f0531ccd8a6f4378293424dfd92db3044'
Michael Niedermayer [Sat, 20 Apr 2013 13:24:25 +0000 (15:24 +0200)]
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>
6 years agoMerge commit '78ce568e43a7f3993c33100aa8f5d56c4c4bd493'
Michael Niedermayer [Sat, 20 Apr 2013 13:11:06 +0000 (15:11 +0200)]
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>
6 years agoMerge commit '278bd2054ca61ab70dfe38f1774409cda2da5359'
Michael Niedermayer [Sat, 20 Apr 2013 12:47:10 +0000 (14:47 +0200)]
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>
6 years agoMerge commit 'bfb41b5039e36b7f873d6ea7d24b31bf3e1a8075'
Michael Niedermayer [Sat, 20 Apr 2013 12:29:16 +0000 (14:29 +0200)]
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>
6 years agoMerge commit '7384b7a71338d960e421d6dc3d77da09b0a442cb'
Michael Niedermayer [Sat, 20 Apr 2013 12:11:10 +0000 (14:11 +0200)]
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>
6 years agoMerge commit '47e5a98174eb9c07ad17be71df129719d60ec8b7'
Michael Niedermayer [Sat, 20 Apr 2013 11:52:58 +0000 (13:52 +0200)]
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>
6 years agoMerge commit '8db00081a37d5b7e23918ee500bb16bc59b57197'
Michael Niedermayer [Sat, 20 Apr 2013 11:42:51 +0000 (13:42 +0200)]
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>
6 years agoMerge commit '28bc406c84b04a5f1458b90ff52ddbec73e46202'
Michael Niedermayer [Sat, 20 Apr 2013 11:21:18 +0000 (13:21 +0200)]
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>
6 years agoMerge commit '2f6bc5f7c193477c2ebc0acce8f2d5551445e129'
Michael Niedermayer [Sat, 20 Apr 2013 08:12:07 +0000 (10:12 +0200)]
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>
6 years agoMerge commit '8071264f2196d71ff49c3944c33f8d3d83f548f1'
Michael Niedermayer [Sat, 20 Apr 2013 07:57:00 +0000 (09:57 +0200)]
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>
6 years agoMerge commit '68d8238cca52e50e8cc81bf2edcaf8088c52d4c0'
Michael Niedermayer [Sat, 20 Apr 2013 07:40:02 +0000 (09:40 +0200)]
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>
6 years agovc1dec: Fix tff == 0 handling in init_block_index()
Michael Niedermayer [Sat, 20 Apr 2013 00:15:13 +0000 (02:15 +0200)]
vc1dec: Fix tff == 0 handling in init_block_index()

This fixes several files from VLC ticket5887

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovc1dec: Fix non pullup tff
Michael Niedermayer [Sat, 20 Apr 2013 00:14:43 +0000 (02:14 +0200)]
vc1dec: Fix non pullup tff

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: remove unused variable
Michael Niedermayer [Fri, 19 Apr 2013 21:43:40 +0000 (23:43 +0200)]
h264: remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/gif: add final_delay option.
Clément Bœsch [Fri, 19 Apr 2013 22:11:04 +0000 (00:11 +0200)]
lavf/gif: add final_delay option.

6 years agolavf/gifdec: add loop support.
Clément Bœsch [Thu, 18 Apr 2013 20:21:58 +0000 (22:21 +0200)]
lavf/gifdec: add loop support.

Loop is ignored by default.

6 years agolavc/gif: miscellaneous cosmetics.
Clément Bœsch [Fri, 19 Apr 2013 21:56:19 +0000 (23:56 +0200)]
lavc/gif: miscellaneous cosmetics.

6 years agoChangelog: notify GIF improvements.
Clément Bœsch [Fri, 19 Apr 2013 21:53:55 +0000 (23:53 +0200)]
Changelog: notify GIF improvements.

6 years agodoc/general: animated GIF are now compressed.
Clément Bœsch [Fri, 19 Apr 2013 21:52:39 +0000 (23:52 +0200)]
doc/general: animated GIF are now compressed.

6 years agolavc/gif: add flag to enable transparency detection between frames.
Clément Bœsch [Fri, 19 Apr 2013 17:01:37 +0000 (19:01 +0200)]
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

6 years agolavc/gif: make possible to disable offsetting.
Clément Bœsch [Fri, 19 Apr 2013 21:36:55 +0000 (23:36 +0200)]
lavc/gif: make possible to disable offsetting.

6 years agox86: Remove unused inline asm instruction defines
Martin Storsjö [Fri, 19 Apr 2013 21:06:48 +0000 (00:06 +0300)]
x86: Remove unused inline asm instruction defines

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agovc1: Remove now unused variables
Martin Storsjö [Fri, 19 Apr 2013 21:04:20 +0000 (00:04 +0300)]
vc1: Remove now unused variables

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 19 Apr 2013 21:34:58 +0000 (23:34 +0200)]
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>
6 years agoMerge commit 'a77aed142cade3beb0cd43f879d4f47daae23b8a'
Michael Niedermayer [Fri, 19 Apr 2013 21:26:55 +0000 (23:26 +0200)]
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>
6 years agoMerge commit 'b357f1d1d3dd1d6672df6a397a31be425d31b6d1'
Michael Niedermayer [Fri, 19 Apr 2013 21:11:44 +0000 (23:11 +0200)]
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>
6 years agoMerge commit '3eec1d41b4a947ba497f528e68da14a8befb85b9'
Michael Niedermayer [Fri, 19 Apr 2013 20:55:21 +0000 (22:55 +0200)]
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>
6 years agoMerge commit '5e83d9aced2fc2b2e1360452794c58aba55d497c'
Michael Niedermayer [Fri, 19 Apr 2013 20:24:33 +0000 (22:24 +0200)]
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>
6 years agocosmetics: bfin: Fix indentation in the dsputil init function
Martin Storsjö [Wed, 3 Apr 2013 11:11:38 +0000 (04:11 -0700)]
cosmetics: bfin: Fix indentation in the dsputil init function

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agodsputil: Remove non-8bpp draw_edge
Ronald S. Bultje [Thu, 14 Mar 2013 17:01:52 +0000 (10:01 -0700)]
dsputil: Remove non-8bpp draw_edge

It is never used.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agodsputil: Merge 9-10 bpp functions for get_pixels and draw_edge
Ronald S. Bultje [Tue, 26 Mar 2013 15:09:05 +0000 (17:09 +0200)]
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>
6 years agodsputil: Remove unused 32-bit functions
Ronald S. Bultje [Tue, 26 Mar 2013 15:07:22 +0000 (17:07 +0200)]
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>
6 years agodsputil: Remove dct_bits
Ronald S. Bultje [Tue, 26 Mar 2013 15:00:21 +0000 (17:00 +0200)]
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>
6 years agodsputil: Remove hpel functions (moved to hpeldsp)
Ronald S. Bultje [Sun, 10 Mar 2013 21:23:46 +0000 (14:23 -0700)]
dsputil: Remove hpel functions (moved to hpeldsp)

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoalpha: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
Ronald S. Bultje [Sun, 10 Mar 2013 23:53:07 +0000 (16:53 -0700)]
alpha: hpeldsp: Move half-pel assembly from dsputil to hpeldsp

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agosparc: hpeldsp: Move vis half-pel assembly from dsputil to hpeldsp
Ronald S. Bultje [Sun, 10 Mar 2013 23:51:25 +0000 (16:51 -0700)]
sparc: hpeldsp: Move vis half-pel assembly from dsputil to hpeldsp

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agosh4: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
Michael Niedermayer [Sun, 10 Mar 2013 23:48:31 +0000 (16:48 -0700)]
sh4: hpeldsp: Move half-pel assembly from dsputil to hpeldsp

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agobfin: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
Ronald S. Bultje [Sun, 10 Mar 2013 23:40:23 +0000 (16:40 -0700)]
bfin: hpeldsp: Move half-pel assembly from dsputil to hpeldsp

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoarm: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
Ronald S. Bultje [Sun, 10 Mar 2013 23:16:45 +0000 (16:16 -0700)]
arm: hpeldsp: Move half-pel assembly from dsputil to hpeldsp

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoppc: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
Ronald S. Bultje [Sun, 10 Mar 2013 22:50:53 +0000 (15:50 -0700)]
ppc: hpeldsp: Move half-pel assembly from dsputil to hpeldsp

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