Commits · f10497042f092d56f82f536276d5998d7fd1e4c4 · Linshizhi / ffmpeg.wasm-core

01 Jun, 2015 17 commits

nvenc: remove cuda.h requirement for nvenc_a · f1049704

James Almer authored Jun 01, 2015

Reviewed-by: Philip Langdale <philipl@overt.org>
Signed-off-by: James Almer <jamrial@gmail.com>

f1049704

avcodec/ppc/pixblockdsp: Fix type of get_pixels_vsx() · a1957a4d
Michael Niedermayer authored Jun 01, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
a1957a4d
avutil/ppc/cpu: Remove !ARCH_PPC64 check for mfspr, the code should now support ppc64 · 9806cca1
Michael Niedermayer authored Jun 01, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
9806cca1
avformat/utils: Simplify get_std_framerate() check · 1e0c34fe
Michael Niedermayer authored Jun 01, 2015
```
This also avoids using a floating point operation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
1e0c34fe

Merge commit '' · d8bbb99c

Michael Niedermayer authored Jun 01, 2015

* commit 'b08caa87':
  nvenc: H264 and HEVC encoders

Conflicts:
	Changelog
	configure
	libavcodec/Makefile
	libavcodec/version.h

This implementation is merged under the name nvenc_b*
Merged-by: Michael Niedermayer <michaelni@gmx.at>

d8bbb99c

avcodec: Rename nvenc.c to nvenc_a.c, to avoid conflict with the other implementation · d0d09137
Michael Niedermayer authored Jun 01, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
d0d09137

Merge commit '' · 211dcdca

Michael Niedermayer authored Jun 01, 2015

* commit '522d971c':
  xsub: Check memory allocation

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

211dcdca

Merge commit '' · 1dc58965

Michael Niedermayer authored Jun 01, 2015

* commit '83797da6':
  wma: Check memory allocation

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

1dc58965

Merge commit '' · 07f606b4

Michael Niedermayer authored Jun 01, 2015

* commit 'e1ea365f':
  truemotion2: Check memory allocation

Conflicts:
	libavcodec/truemotion2.c

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

07f606b4

Merge commit '' · f24b7d76

Michael Niedermayer authored Jun 01, 2015

* commit '28fb80dc':
  svq1: Check memory allocation

Conflicts:
	libavcodec/svq1enc.c

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

f24b7d76

Merge commit '' · abee1972

Michael Niedermayer authored Jun 01, 2015

* commit '42df71d9':
  ratecontrol: Check memory allocation

Conflicts:
	libavcodec/ratecontrol.c

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

abee1972

Merge commit '' · 6ed8341c

Michael Niedermayer authored Jun 01, 2015

* commit '0994e142':
  pthread: Check memory allocation

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

6ed8341c

Merge commit '' · 615e73ab

Michael Niedermayer authored Jun 01, 2015

* commit '03927cb7':
  psymodel: Check memory allocation

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

615e73ab

Merge commit '' · 1a903f0d

Michael Niedermayer authored Jun 01, 2015

* commit 'fef2f472':
  xvid: Check memory allocation

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

1a903f0d

Merge commit '' · 8b94cee9

Michael Niedermayer authored Jun 01, 2015

* commit '9fb483fe':
  x264: Check memory allocation

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

8b94cee9

Merge commit '' · fb7b5dc0

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 23 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