Commits · f6dcd844ee65b187b7b352e3740c43724175b3e1 · Linshizhi / ffmpeg.wasm-core

20 Apr, 2013 17 commits

Michael Niedermayer authored Apr 20, 2013

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

Conflicts:
	libavcodec/dsputil.c
	libavcodec/dsputil_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

f6dcd844

Merge commit '' · c3624cfe

Michael Niedermayer authored Apr 20, 2013

* commit 'c443117f':
  dsputil: Remove dct_bits

Conflicts:
	libavcodec/dsputil.c
	libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

c3624cfe

Merge commit '' · d2d2c309

Michael Niedermayer authored Apr 20, 2013

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

Conflicts:
	libavcodec/hpeldsp.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

d2d2c309

Merge commit '' · 6ec26157

Michael Niedermayer authored Apr 20, 2013

* commit '2957d29f':
  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>

6ec26157

Merge commit '' · fdb1f7eb

Michael Niedermayer authored Apr 20, 2013

* commit '78ce568e':
  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>

fdb1f7eb

Merge commit '' · 4bdec0e7

Michael Niedermayer authored Apr 20, 2013

* commit '278bd205':
  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>

4bdec0e7

Merge commit '' · c5a11ab6

Michael Niedermayer authored Apr 20, 2013

* commit 'bfb41b50':
  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>

c5a11ab6

Merge commit '' · c4010972

Michael Niedermayer authored Apr 20, 2013

* commit '7384b7a7':
  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>

c4010972

Merge commit '' · 055e5c8e

Michael Niedermayer authored Apr 20, 2013

* commit '47e5a981':
  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>

055e5c8e

Merge commit '' · d0aa60da

Michael Niedermayer authored Apr 20, 2013

* commit '8db00081':
  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>

d0aa60da

Merge commit '' · 3fee9fa0

Michael Niedermayer authored Apr 20, 2013

* commit '28bc406c':
  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>

3fee9fa0

Merge commit '' · ab4ba6b7

Michael Niedermayer authored Apr 20, 2013

* commit '2f6bc5f7':
  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>

ab4ba6b7

Merge commit '' · 3c662170

Michael Niedermayer authored Apr 20, 2013

* commit '8071264f':
  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>

3c662170

Merge commit '' · 23de9e91

Michael Niedermayer authored Apr 20, 2013

* commit '68d8238c':
  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>

23de9e91

vc1dec: Fix tff == 0 handling in init_block_index() · 6c9d28a2
Michael Niedermayer authored Apr 20, 2013
```
This fixes several files from VLC ticket5887
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
6c9d28a2
vc1dec: Fix non pullup tff · a0fbc28c
Michael Niedermayer authored Apr 20, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
a0fbc28c
h264: remove unused variable · 8ebfd7c4
Michael Niedermayer authored Apr 19, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
8ebfd7c4

19 Apr, 2013 23 commits
- lavf/gif: add final_delay option. · 67cc31d6
  Clément Bœsch authored Apr 19, 2013
  
  67cc31d6
- lavf/gifdec: add loop support. · a16c2056
  Clément Bœsch authored Apr 18, 2013
```
Loop is ignored by default.
```
  a16c2056
- lavc/gif: miscellaneous cosmetics. · f5ede48f
  Clément Bœsch authored Apr 19, 2013
  
  f5ede48f
- Changelog: notify GIF improvements. · 7004cad3
  Clément Bœsch authored Apr 19, 2013
  
  7004cad3
- doc/general: animated GIF are now compressed. · 5927ebab
  Clément Bœsch authored Apr 19, 2013
  
  5927ebab
- lavc/gif: add flag to enable transparency detection between frames. · e1b35bdd
  Clément Bœsch authored Apr 19, 2013
```
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
```
  e1b35bdd
- lavc/gif: make possible to disable offsetting. · 0f1250b7
  Clément Bœsch authored Apr 19, 2013
  
  0f1250b7
- Merge remote-tracking branch 'qatar/master' · 8f116bf7
  Michael Niedermayer authored Apr 19, 2013
```
* 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>
```
  8f116bf7
- Merge commit 'a77aed14' · e07e8882
  Michael Niedermayer authored Apr 19, 2013
```
* commit 'a77aed14':
  fate: Rename video filters file and add separate video filters target

Conflicts:
	tests/fate/filter-video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  e07e8882
- Merge commit 'b357f1d1' · 6c5989cc
  Michael Niedermayer authored Apr 19, 2013
```
* commit 'b357f1d1':
  fate: Split audio filters into their own separate file

Conflicts:
	tests/Makefile
	tests/fate/filter.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  6c5989cc
- Merge commit '3eec1d41' · 4cb59ad8
  Michael Niedermayer authored Apr 19, 2013
```
* commit '3eec1d41':
  fate: Reuse VREF and AREF variables where appropriate

Conflicts:
	tests/fate/filter.mak
	tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  4cb59ad8
- Merge commit '5e83d9ac' · f4b05cd8
  Michael Niedermayer authored Apr 19, 2013
```
* commit '5e83d9ac':
  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>
```
  f4b05cd8
- dsputil: Remove unused 32-bit functions · 619e0da1
  Ronald S. Bultje authored Mar 26, 2013
```
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>
```
  619e0da1
- dsputil: Remove dct_bits · c443117f
  Ronald S. Bultje authored Mar 26, 2013
```
dct_bits is never set except in h264, where it is never used,
thus remove it.
Signed-off-by: Martin Storsjö <martin@martin.st>
```
  c443117f
- dsputil: Remove hpel functions (moved to hpeldsp) · 54cd5e4f
  Ronald S. Bultje authored Mar 10, 2013
```
Signed-off-by: Martin Storsjö <martin@martin.st>
```
  54cd5e4f
- alpha: hpeldsp: Move half-pel assembly from dsputil to hpeldsp · 2957d29f
  Ronald S. Bultje authored Mar 10, 2013
```
Signed-off-by: Martin Storsjö <martin@martin.st>
```
  2957d29f
- sparc: hpeldsp: Move vis half-pel assembly from dsputil to hpeldsp · 78ce568e
  Ronald S. Bultje authored Mar 10, 2013
```
Signed-off-by: Martin Storsjö <martin@martin.st>
```
  78ce568e
- sh4: hpeldsp: Move half-pel assembly from dsputil to hpeldsp · 278bd205
  Michael Niedermayer authored Mar 10, 2013
```
Signed-off-by: Martin Storsjö <martin@martin.st>
```
  278bd205
- bfin: hpeldsp: Move half-pel assembly from dsputil to hpeldsp · bfb41b50
  Ronald S. Bultje authored Mar 10, 2013
```
Signed-off-by: Martin Storsjö <martin@martin.st>
```
  bfb41b50
- arm: hpeldsp: Move half-pel assembly from dsputil to hpeldsp · 7384b7a7
  Ronald S. Bultje authored Mar 10, 2013
```
Signed-off-by: Martin Storsjö <martin@martin.st>
```
  7384b7a7
- ppc: hpeldsp: Move half-pel assembly from dsputil to hpeldsp · 47e5a981
  Ronald S. Bultje authored Mar 10, 2013
```
Signed-off-by: Martin Storsjö <martin@martin.st>
```
  47e5a981
- x86: hpeldsp: Move half-pel assembly from dsputil to hpeldsp · 8db00081
  Ronald S. Bultje authored Mar 10, 2013
```
Signed-off-by: Martin Storsjö <martin@martin.st>
```
  8db00081
- mjpeg: Use hpeldsp instead of dsputil for half-pel functions · 28bc406c
  Ronald S. Bultje authored Mar 10, 2013
```
Signed-off-by: Martin Storsjö <martin@martin.st>
```
  28bc406c