Commits · 2980c8e7d34e84f98b09965d208a583a16d5aded · Linshizhi / ffmpeg.wasm-core

17 Feb, 2015 20 commits

Michael Niedermayer authored Feb 17, 2015

* commit 'cb70a93c':
  lavc: Document interaction between avcodec_open2() and decoding routines

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

2980c8e7

Merge commit '' · 79216a18

Michael Niedermayer authored Feb 17, 2015

* commit '733f4b05':
  avplay: Check format allocation inside decode_thread()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

79216a18

Merge commit '' · 32b2b7bd

Michael Niedermayer authored Feb 17, 2015

* commit '266f2411':
  avplay: Check frame allocation inside video_thread()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

32b2b7bd

Merge commit '' · 15cd2a93

Michael Niedermayer authored Feb 17, 2015

* commit '81688e68':
  avconv: Check rc_override memory allocation

Conflicts:
	ffmpeg_opt.c

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

15cd2a93

Merge commit '' · 9d5017a2

Michael Niedermayer authored Feb 17, 2015

* commit '9d3b752f':
  graphparser: Check av_get_token() memory error
Merged-by: Michael Niedermayer <michaelni@gmx.at>

9d5017a2

avformat/matroskaenc: Use the correct data type for the chapter times · a4cd057b
Michael Niedermayer authored Feb 17, 2015
```
Fixes potential integer overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
a4cd057b

Merge commit '' · d302853b

Michael Niedermayer authored Feb 17, 2015

* commit '5dc47a2b':
  matroskaenc: Validate chapter start and end times

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

d302853b

Merge commit '' · d2668ae4

Michael Niedermayer authored Feb 17, 2015

* commit 'f8c17197':
  dca: Remove separate header for DCA ExSS

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

d2668ae4

avcodec/vp56: Add () to protect TRANSPOSE()s arguments · 03dab49a
Michael Niedermayer authored Feb 17, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
03dab49a
lavc: Document interaction between avcodec_open2() and decoding routines · cb70a93c
Vittorio Giovara authored Dec 04, 2014

cb70a93c
avplay: Check format allocation inside decode_thread() · 733f4b05
Vittorio Giovara authored Feb 04, 2015
```
CC: libav-stable@libav.org
Bug-Id: CID 1265718
```
733f4b05
avplay: Check frame allocation inside video_thread() · 266f2411
Vittorio Giovara authored Feb 04, 2015
```
CC: libav-stable@libav.org
Bug-Id: CID 1267893
```
266f2411
avconv: Check rc_override memory allocation · 81688e68
Vittorio Giovara authored Feb 04, 2015
```
CC: libav-stable@libav.org
Bug-Id: CID 1265719
```
81688e68
graphparser: Check av_get_token() memory error · 9d3b752f
Vittorio Giovara authored Feb 04, 2015
```
CC: libav-stable@libav.org
Bug-Id: CID 1267891
```
9d3b752f
matroskaenc: Validate chapter start and end times · 5dc47a2b
Vittorio Giovara authored Feb 03, 2015
```
CC: libav-stable@libav.org
Bug-Id: CID 1265717
```
5dc47a2b
avfilter/paletteuse: raise cache size from 64k to 512k · a00bab34
Clément Bœsch authored Feb 17, 2015
```
(or 32k to 256k in 32-bit)
```
a00bab34

x86: hevc_mc: fewer xmm regs used in epel h/v · 398f5319

Christophe Gisquet authored Feb 16, 2015

11 xmm regs seem only required for avx2.

Reviewed-by: Mickaël Raulet <mraulet@insa-rennes.fr
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

398f5319

Force linking against user32 if dxva2 is enabled. · a9dc94c3

Carl Eugen Hoyos authored Feb 17, 2015

Fixes compilation with vfwcap disabled.
Reported and tested by Bernhard Döbler, programmer bardware de

Reviewed-by: Matt Oliver

a9dc94c3

x86/doc/Makefile: DBG=1 to preprocess external asm · bc8e044d

Christophe Gisquet authored Feb 08, 2015

The macro hell sometimes make it difficult to trace the source of
an error, so it is easier to analyze the preprocessed output.

This patch makes this automatical by specifying DBG=1 on the
command line: a file ffmpeg/dir/file.asm gets preprocessed to
builddir/dir/file.dbg.asm, which is then compiled.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

bc8e044d

x86inc: Correctly warn on use of SSE2 instructions in SSE functions · d9293c77

Christophe Gisquet authored Feb 03, 2015

SSE2 instructions that are XMM-implementations of pre-existing MMX/MMX2
instructions did not issue warnings when used in SSE functions. Handle
it by also checking the register type when such instructions are used.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

d9293c77

16 Feb, 2015 20 commits
- avfilter/vf_fieldmatch: Add () to protect the arguments of the HAS_FF_AROUND() macro · 2bae7b33
  Michael Niedermayer authored Feb 16, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  2bae7b33
- avfilter/vf_phase: Add () to protect DIFF()s arguments · f15c734b
  Michael Niedermayer authored Feb 16, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  f15c734b
- swresample/resample_template: Add () to protect the arguments of the OUT() macro · 0cb95f90
  Michael Niedermayer authored Feb 16, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  0cb95f90
- avutil/aes: Add () to protect the ROT() arguments · 52d19290
  Michael Niedermayer authored Feb 16, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  52d19290
- avutil/attributes: Add () to protect the AV_GCC_VERSION_AT_LEAST() arguments · 06309fc7
  Michael Niedermayer authored Feb 16, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  06309fc7
- avutil/intmath: Add () to protect the ff_log2() argument · f8607cfb
  Michael Niedermayer authored Feb 16, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  f8607cfb
- avutil/murmur3: Add () to protect the ROT() arguments · cdee0c9d
  Michael Niedermayer authored Feb 16, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  cdee0c9d
- avutil/version: Add () to protect the AV_VERSION_INT() arguments · 9cde41cd
  Michael Niedermayer authored Feb 16, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  9cde41cd
- avformat/tedcaptionsdec: add () to protect the argument of ERR_CODE() · 527f1d22
  Michael Niedermayer authored Feb 16, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  527f1d22
- avutil/log: add () to protect the argument of AV_LOG_C() · 61eb602d
  Michael Niedermayer authored Feb 16, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  61eb602d
- avcodec/vc1dsp: add () to protect the arguments of the op* macros · e3f71423
  Michael Niedermayer authored Feb 16, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  e3f71423
- avcodec/ac3: add () to protect the macro arguments · cb9d4045
  Michael Niedermayer authored Feb 16, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  cb9d4045
- avformat/mpc8: Add () to protect MKMPCTAG()s arguments · 0b638b83
  Michael Niedermayer authored Feb 16, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  0b638b83
- avcodec/me_cmp: add () to protect avg*s arguments · 23578226
  Michael Niedermayer authored Feb 16, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  23578226
- avcodec/bmvvideo: Add () to protect NEXT_BYTE() argument · 17a62cbc
  Michael Niedermayer authored Feb 16, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  17a62cbc
- swresample/swresample-test: Add () to protect uint_rand() argument · 37013fd0
  Michael Niedermayer authored Feb 16, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  37013fd0
- avformat/tls: add () to protect macro arguments · ced26a2c
  Michael Niedermayer authored Feb 16, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  ced26a2c
- avcodec/hevcdsp: add missing () to CMP macro · 6e365198
  James Almer authored Feb 16, 2015
```
Found-by: Clément Bœsch <u@pkh.me>
Signed-off-by: James Almer <jamrial@gmail.com>
```
  6e365198
- x86: hevc_mc: save 1 gpr in epel filter loading · 89cb4995
  Christophe Gisquet authored Feb 07, 2015
```
The 3*stride value stored in r3src can be loaded much later,
so use r3src instead of a dedicated gpr when possible.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  89cb4995
- avcodec/hevcdsp: optimize pixel comparison in sao_edge_filter · 22596383
  James Almer authored Feb 16, 2015
```
GCC 4.9.2 on a Core i5-4200U @ 1.60GHz, Linux x86_64

Before
715487 decicycles in sao_edge_filter_8, 262144 runs, 0 skips

After
672104 decicycles in sao_edge_filter_8, 262144 runs, 0 skips
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
```
  22596383