Commits · 5307fa00a45b50897af3d5070e936fcaa82ae19e · Linshizhi / ffmpeg.wasm-core

02 Jul, 2014 8 commits

avcodec/dvdec: remove redundant null check · 5307fa00
Michael Niedermayer authored Jul 02, 2014
```
Fixes CID700682 again
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
5307fa00
avcodec/bitstream: remove trivial assert · d266ecff
Michael Niedermayer authored Jul 02, 2014
```
Fixed CID1224273
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
d266ecff

swr: rename swresample_dsp init functions to swri_resample_dsp · b5f0eac0

James Almer authored Jul 02, 2014

The swresample_ prefix is not for internal functions
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

b5f0eac0

doc/filters: fix typo · 1619a0e2

Dave Rice authored Jul 02, 2014

Signed-off-by: Dave Rice <dave@dericed.com>
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

1619a0e2

ffmpeg: check av_opt_set_dict() return · 4930cd13
Michael Niedermayer authored Jul 02, 2014
```
Fixes CID1224275
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
4930cd13

doc/ffprobe.xsd: fix order and missing elements/attributes · 79d3eeb2

Dave Rice authored Jul 02, 2014

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

79d3eeb2

swr: remove obsolete resample prototypes · 42a92a24

James Almer authored Jul 02, 2014

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

42a92a24

Partially revert "swr: add prototypes for resample dsp functions" · 23a9edf5

James Almer authored Jul 01, 2014

Prototypes are not needed anymore now that the x86 functions don't
include resample_template.c

The DO_RESAMPLE_ONE macro is removed for that same reason as well.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

23a9edf5

01 Jul, 2014 27 commits

x86/swr: add ff_resample_{common, linear}_int16_xop · c45b7f0d

James Almer authored Jun 30, 2014

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

c45b7f0d

x86/swr: add ff_resample_{common, linear}_float_fma · 1a69224f

James Almer authored Jun 30, 2014

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

1a69224f

x86: rename dsputil.asm to idctdsp.asm · a441a243

James Almer authored Jul 01, 2014

Its only function is no longer part of dsputil.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

a441a243

avcodec/mjpegdec: factorize some parts of the pix_fmt_id switch() · ef7e8425
Michael Niedermayer authored Jul 01, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
ef7e8425
avcodec/mjpegdec: handle luma upscale detection generically · 784e1cf7
Michael Niedermayer authored Jul 01, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
784e1cf7
avcodec/mjpegdec: set upscale_h/upscale_v using generic code instead of hardcoding a list · 64d98dad
Michael Niedermayer authored Jul 01, 2014
```
Some code is left to handle corner cases
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
64d98dad
avcodec/mjpegdec: Support pix_fmt_id==0x11222200 · 7558e553
Michael Niedermayer authored Jul 01, 2014
```
Fixes: 4858286_300.jpg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
7558e553
avcodec/mjpegdec: fix width for non chroma in rescaling · cd417d94
Michael Niedermayer authored Jul 01, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
cd417d94
mjpegdec: Support pix_fmt_id == 0x22112200 · 4e09300f
Michael Niedermayer authored Jul 01, 2014
```
Fixes 4780490_300.jpg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
4e09300f

Merge commit '' · 141ee109

Michael Niedermayer authored Jul 01, 2014

* commit '48e64324':
  matroska: Factor out mkv_write_stereo_mode

Conflicts:
	libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

141ee109

Merge commit '' · ee78b0c2

Michael Niedermayer authored Jul 01, 2014

* commit 'b75a1f98':
  matroska: Factor out write_track from mkv_write_tracks

Conflicts:
	libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

ee78b0c2

Merge commit '' · 8365287e

Michael Niedermayer authored Jul 01, 2014

* commit 'f1f6156b':
  matroska: K&R formatting cosmetics

Conflicts:
	libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

8365287e

Merge commit '' · 06e5d28e

Michael Niedermayer authored Jul 01, 2014

* commit 'd0449e75':
  vaapi: Update idct_permutation location after dsputil/idctdsp split

See: 581b5f0bMerged-by: Michael Niedermayer <michaelni@gmx.at>

06e5d28e

x86/swr: convert resample_{common, linear}_double_sse2 to yasm · dd2c9034

James Almer authored Jun 30, 2014

Signed-off-by: James Almer <jamrial@gmail.com>

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

dd2c9034

matroska: Factor out mkv_write_stereo_mode · 48e64324
Luca Barbato authored Jun 06, 2014

48e64324
matroska: Factor out write_track from mkv_write_tracks · b75a1f98
Luca Barbato authored Jun 06, 2014

b75a1f98
matroska: K&R formatting cosmetics · f1f6156b
Luca Barbato authored Jun 06, 2014

f1f6156b
vaapi: Update idct_permutation location after dsputil/idctdsp split · d0449e75
Diego Biurrun authored Jul 01, 2014

d0449e75

Merge commit '' · fb318def

Michael Niedermayer authored Jul 01, 2014

* commit '20f95f21':
  mov: Support default-base-is-moof.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

fb318def

Merge commit '' · 8d0c7031

Michael Niedermayer authored Jul 01, 2014

* commit '79793f83':
  Update Fiona's name in copyright statements.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

8d0c7031

Merge commit '' · 581b5f0b

Michael Niedermayer authored Jul 01, 2014

* commit 'e3fcb143':
  dsputil: Split off IDCT bits into their own context

Conflicts:
	configure
	libavcodec/aic.c
	libavcodec/arm/Makefile
	libavcodec/arm/dsputil_init_arm.c
	libavcodec/arm/dsputil_init_armv6.c
	libavcodec/asvdec.c
	libavcodec/dnxhdenc.c
	libavcodec/dsputil.c
	libavcodec/dvdec.c
	libavcodec/dxva2_mpeg2.c
	libavcodec/intrax8.c
	libavcodec/mdec.c
	libavcodec/mjpegdec.c
	libavcodec/mjpegenc_common.h
	libavcodec/mpegvideo.c
	libavcodec/ppc/dsputil_altivec.h
	libavcodec/ppc/dsputil_ppc.c
	libavcodec/ppc/idctdsp.c
	libavcodec/x86/Makefile
	libavcodec/x86/dsputil_init.c
	libavcodec/x86/dsputil_mmx.c
	libavcodec/x86/dsputil_x86.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

581b5f0b

mov: Support default-base-is-moof. · 20f95f21

Yusuke Nakamura authored Jul 01, 2014

default-base-is-moof shall be set to track fragments compatible with DASH
Media Segments. So, this is a fundamental support for ISOBMFF ver. DASH.
This is meaningful only when base-data-offset-present is absent and two or
more track fragments are present in a movie fragment.
Signed-off-by: Martin Storsjö <martin@martin.st>

20f95f21

Merge commit '' · 909f53f2

Michael Niedermayer authored Jul 01, 2014

* commit 'adcb8392':
  mjpeg: Split off bits shared by MJPEG and LJPEG encoders

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

909f53f2

Update Fiona's name in copyright statements. · 79793f83
Diego Biurrun authored Jul 01, 2014

79793f83
avfilter/f_ebur128: Use av_malloc_array() · a97137e9
Michael Niedermayer authored Jul 01, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
a97137e9
avcodec/hevc: Use av_malloc(z)_array() · 7faa7d3d
Michael Niedermayer authored Jul 01, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
7faa7d3d
cmdutils_opencl: Use av_malloc_array() · 80da227c
Michael Niedermayer authored Jul 01, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
80da227c

30 Jun, 2014 5 commits

avfilter/showcqt: adding freetype support · 46563af7
Muhammad Faiz authored Jun 30, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
46563af7
avdevice/xv: fix missing { · 9efa7f82
Michael Niedermayer authored Jun 30, 2014
```
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
9efa7f82
swr: convert resample_common/linear_int16_mmx2/sse2 to yasm. · 847bb638
Ronald S. Bultje authored Jun 29, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
847bb638

lavd/xv: handle delete window message · e5c806fd

Lukasz Marek authored May 27, 2014

User may close X11 window by close button on tray.
FFmpeg leaves in graceless way.
This commit detects it and return EPIPE error.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

e5c806fd

avcodec/pgssubdec: remove unused variables · e429d6c1
Michael Niedermayer authored Jun 30, 2014
```
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
e429d6c1