Commits · fb7b5dc0e6146e21e67a1de0c32567e69edb33a6 · Linshizhi / ffmpeg.wasm-core

01 Jun, 2015 2 commits

Michael Niedermayer authored Jun 01, 2015

* commit '41658bc8':
  libtheora: Check memory allocation

Conflicts:
	libavcodec/libtheoraenc.c

See: 67d4d5f5
See: 27216bf3Merged-by: Michael Niedermayer <michaelni@gmx.at>

fb7b5dc0

Merge commit '' · 3377f6fd

Michael Niedermayer authored May 31, 2015

* commit '8df5fbf0':
  lcl: Check memory allocation

Conflicts:
	libavcodec/lclenc.c

See: 6dbcecd7Merged-by: Michael Niedermayer <michaelni@gmx.at>

3377f6fd

31 May, 2015 38 commits

Merge commit '' · 513673a8

Michael Niedermayer authored May 31, 2015

* commit '7ca603f9':
  jpegls: Check memory allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>

513673a8

Merge commit '' · 73e150ff

Michael Niedermayer authored May 31, 2015

* commit '7d2a6826':
  huffyuv: Check memory allocation

See: 4a722a5cMerged-by: Michael Niedermayer <michaelni@gmx.at>

73e150ff

Merge commit '' · 10531d48

Michael Niedermayer authored May 31, 2015

* commit '7fccc96d':
  eatgv: Check memory allocation

Conflicts:
	libavcodec/eatgv.c

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

10531d48

Merge commit '' · 3a8b16f7

Michael Niedermayer authored May 31, 2015

* commit '69277069':
  dct: Check memory allocation

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

3a8b16f7

Merge commit '' · 7110b024

Michael Niedermayer authored May 31, 2015

* commit 'e524f373':
  asv: Check memory allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>

7110b024

avcodec/aacpsy: Clear the correct pointer · e7a65142
Michael Niedermayer authored May 31, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
e7a65142

Merge commit '' · 63fdedc7

Michael Niedermayer authored May 31, 2015

* commit '074a1b37':
  aacpsy: Check memory allocation

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

63fdedc7

Merge commit '' · 0f69f02e

Michael Niedermayer authored May 31, 2015

* commit '149fa0b7':
  mpegvideo: Move MotionEstContext and function declarations to a separate header

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

0f69f02e

Merge commit '' · 0aba7192

Michael Niedermayer authored May 31, 2015

* commit 'b2b76691':
  mpegvideo: mpeg12: Move function declarations
Merged-by: Michael Niedermayer <michaelni@gmx.at>

0aba7192

Merge commit '' · fd116b8d

Michael Niedermayer authored May 31, 2015

* commit '378a0008':
  mpegvideo: Move tables to a separate file
Merged-by: Michael Niedermayer <michaelni@gmx.at>

fd116b8d

Merge commit '' · eb5a308d

Michael Niedermayer authored May 31, 2015

* commit '31a117a0':
  mpegvideo: msmpeg4: Move function declarations
Merged-by: Michael Niedermayer <michaelni@gmx.at>

eb5a308d

Merge commit '' · f5ee10c1

Michael Niedermayer authored May 31, 2015

* commit '2f15846a':
  mpegvideo: wmv2: Move function declarations

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

f5ee10c1

Merge commit '' · f9dcf169

Michael Niedermayer authored May 31, 2015

* commit '902a55f7':
  dxva2_hevc: re-write reference frame handling

See: 902a55f7Merged-by: Michael Niedermayer <michaelni@gmx.at>

f9dcf169

Merge commit '' · cdf68040

Michael Niedermayer authored May 31, 2015

* commit '35818b8a':
  dxva2_hevc: fix 32x32 scaling lists

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

cdf68040

Merge commit '' · 9e1cdfb8

Michael Niedermayer authored May 31, 2015

* commit '5c720657':
  mov: always check avio_read return value

Conflicts:
	libavformat/mov.c

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

9e1cdfb8

Merge commit '' · ebab902a

Michael Niedermayer authored May 31, 2015

* commit 'bff0349d':
  avio: Add avio_read wrapper to simplify error checking
Merged-by: Michael Niedermayer <michaelni@gmx.at>

ebab902a

Merge commit '' · 3bd43430

Michael Niedermayer authored May 31, 2015

* commit 'cffb9ea8':
  mov: reject zero bytes_per_frame with non-zero samples_per_frame

See: 83a04f8cMerged-by: Michael Niedermayer <michaelni@gmx.at>

3bd43430

Merge commit '' · 2bedd17b

Michael Niedermayer authored May 31, 2015

* commit '8e9c39e8':
  mov: abort on EOF in ff_mov_read_chan

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

2bedd17b

Merge commit '' · 348319f5

Michael Niedermayer authored May 31, 2015

* commit 'a8a90906':
  mov: Correctly allocate ctts_data

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

348319f5

Merge commit '' · c2876c01

Michael Niedermayer authored May 31, 2015

* commit 'f261a55d':
  mov: Fix two memleaks

See: 8e77f8abMerged-by: Michael Niedermayer <michaelni@gmx.at>

c2876c01

Merge commit '' · 61e12875

Michael Niedermayer authored May 31, 2015

* commit '3f38d4b8':
  vp9: Parse subsampling and report missing feature

Conflicts:
	libavcodec/vp9.c
	libavcodec/vp9.h

No change as FFmpeg already supports subsampling
Merged-by: Michael Niedermayer <michaelni@gmx.at>

61e12875

Merge commit '' · b66b1a10

Michael Niedermayer authored May 31, 2015

* commit 'd68c0538':
  x86: check for AV_CPU_FLAG_AVXSLOW where useful

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

b66b1a10

x86: check for AV_CPU_FLAG_AVXSLOW where useful · c16e99e3

James Almer authored May 31, 2015

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

c16e99e3

Merge commit '' · 16c430e8

Michael Niedermayer authored May 31, 2015

* commit 'cae39851':
  x86: Add helper macros to check for slow cpuflags
Merged-by: Michael Niedermayer <michaelni@gmx.at>

16c430e8

Merge commit '' · c140227a

Michael Niedermayer authored May 31, 2015

* commit 'f7cafb5d':
  x86: add AV_CPU_FLAG_AVXSLOW flag

Conflicts:
	doc/APIchanges
	libavutil/version.h

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

c140227a

Merge commit '' · 1ff47770

Michael Niedermayer authored May 31, 2015

* commit 'd0bf20a4':
  ppc: vsx: Implement diff_pixels and get_pixels
Merged-by: Michael Niedermayer <michaelni@gmx.at>

1ff47770

avutil/ppc/float_dsp_init: Disable duplicate functions · 1046b6b0
Michael Niedermayer authored May 31, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
1046b6b0

Merge commit '' · da9a6f4a

Michael Niedermayer authored May 31, 2015

* commit 'eecd29b3':
  ppc: vsx: Implement float_dsp

Conflicts:
	libavutil/ppc/float_dsp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

da9a6f4a

configure: ldbrx seems not working on qemu power8, disable for now · 1aff9050
Michael Niedermayer authored May 31, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
1aff9050

Merge commit '' · 58a42048

Michael Niedermayer authored May 31, 2015

* commit '7d07ee5a':
  ppc: cpu: Add support for VSX and POWER8 extensions
Merged-by: Michael Niedermayer <michaelni@gmx.at>

58a42048

Merge commit '' · 902ce2a6

Michael Niedermayer authored May 31, 2015

* commit 'da60b99a':
  ppc: Restrict some Altivec implementations to Big Endian

Conflicts:
	libavcodec/ppc/huffyuvdsp_altivec.c
	libavcodec/ppc/me_cmp.c

Not merged, our PPC64LE fate clients passed all tests last time they did run
Merged-by: Michael Niedermayer <michaelni@gmx.at>

902ce2a6

Merge commit '' · 3f21cdd8

Michael Niedermayer authored May 31, 2015

* commit 'f22ebd25':
  ppc: configure: Support ISA 2.06 and later

Conflicts:
	configure

See: ab123739 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>

3f21cdd8

Merge commit '' · 8dcbfb73

Michael Niedermayer authored May 31, 2015

* commit '3058872c':
  ppc: Clarify and extend the cpuid check

Conflicts:
	libavutil/ppc/cpu.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

8dcbfb73

avutil/ppc/cpu: Check if unistd.h is available before including it · 47cc1a2b
Michael Niedermayer authored May 31, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
47cc1a2b

Merge commit '' · ff199543

Michael Niedermayer authored May 31, 2015

* commit 'baa94563':
  ppc: linux: Check altivec using the auxv

Conflicts:
	libavutil/ppc/cpu.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

ff199543

Merge commit '' · 08f229d8

Michael Niedermayer authored May 31, 2015

* commit '7014b659':
  ppc: pixblockdsp: Use the abriged vector types
Merged-by: Michael Niedermayer <michaelni@gmx.at>

08f229d8

Merge commit '' · e8676c75

Michael Niedermayer authored May 31, 2015

* commit '72cebae0':
  ppc: avutil: Use the abriged vector types

Conflicts:
	libavutil/ppc/float_dsp_altivec.c
	libavutil/ppc/util_altivec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

e8676c75

Merge commit '' · 876a663c

Michael Niedermayer authored May 31, 2015

* commit '254eb5b6':
  ppc: avutil: Drop a potentially dangerous workaround

See: 9564375dMerged-by: Michael Niedermayer <michaelni@gmx.at>

876a663c