Commits · 1537d0b432d8cad62b6c8af1960674ac452be7ac · Linshizhi / ffmpeg.wasm-core

02 Dec, 2014 20 commits

Michael Niedermayer authored Dec 02, 2014

* commit '604c9b11':
  rtsp: move the CONFIG_ macros to the beginning of the check

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

1537d0b4

Merge commit '' · 61d0a6dd

Michael Niedermayer authored Dec 02, 2014

* commit '7464e98f':
  aac: Simplify decode_mid_side_stereo

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

61d0a6dd

Merge remote-tracking branch 'cigaes/master' · 9adc999d

Michael Niedermayer authored Dec 02, 2014

* cigaes/master:
  configure: add a note about pkg-config --static.
  configure: add optional pkg-config helper and use it.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

9adc999d

avcodec/aacdec: Use avpriv_float_dsp_alloc() · 68b8e21b
Michael Niedermayer authored Dec 02, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
68b8e21b

Revert "avfilter/vf_interlace: more accurate pts calculation" · 46b64e30

Michael Niedermayer authored Dec 02, 2014

This reverts commit df8248f6.

the revert produces a timebase and timestamps that are more close
to what users expect

Hoped-by: koda

46b64e30

configure: add a note about pkg-config --static. · 6c96aa06

Nicolas George authored Dec 02, 2014

Try to detect "$cc -static" without "pkg-config --static".
Also, when a library detection using pkg-config fails,
make it explicit this was pkg-config.

6c96aa06

configure: add optional pkg-config helper and use it. · cfcaf6b3

Nicolas George authored Dec 02, 2014

The require variant dies if the package is not present.
The check variant does not import the flags to the used list.
The new variant imports the flags if the package is present
but does not die if it is not.
The new call graph is: require -> use -> check.

Use use_pkg_config for libx264 and libsmbclient: more readable
and three external call less per library.

cfcaf6b3

avfilter/vf_tinterlace: Favor using standard timebases for the output · 59f1f764

Michael Niedermayer authored Dec 01, 2014

Reported-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Inspired by discussion with Kieran Kunhya <kierank@obe.tv>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

59f1f764

avcodec/ppc/lossless_audiodsp_altivec: POWER LE support for scalarproduct_and_madd_int16_altivec() · b4d41bee
Rong Yan authored Dec 02, 2014
```
adds macro GET_T()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
b4d41bee

rtsp: move the CONFIG_ macros to the beginning of the check · 604c9b11

Vittorio Giovara authored Nov 29, 2014

With --disable-optimizations, the DCE of some compilers does not remove
such unused code, causing linking failure.

604c9b11

aac: Simplify decode_mid_side_stereo · 7464e98f
Luca Barbato authored Nov 21, 2014
```
Might spare few cycles if the compiler is naive and
makes the function more readable.
```
7464e98f
avformat/apngdec: exit probing when skipping is not possible. · d7716961
Benoit Fouet authored Dec 02, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
d7716961
apng: move shared header from avformat to avcodec. · 543fceba
Benoit Fouet authored Dec 02, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
543fceba
lavf/qcp: Print unknown GUID on error. · f151f541
Carl Eugen Hoyos authored Dec 02, 2014

f151f541
Also print GUIDs as shown in the Windows registry to ease debugging. · 7f6515e4
Carl Eugen Hoyos authored Dec 02, 2014

7f6515e4
lavc/dirac_arith: Only compile x86 asm if ARCH_X86 is set. · ea5423a0
Carl Eugen Hoyos authored Dec 02, 2014
```
Fixes ticket #3544.
```
ea5423a0

tests: Add vsynth2 which uses the new reference.pnm · 42801505

Michael Niedermayer authored Nov 30, 2014

The file is already present in git and by using it we can perform more tests
without the need of fate samples
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

42801505

tests: Rename vsynth2 to vsynth_lena · ed49b142

Michael Niedermayer authored Nov 30, 2014

This avoids confusion with a growing number of vsynth tests
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ed49b142

avformat/crypto: Use av_memdup() · 24e7e023
Michael Niedermayer authored Dec 02, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
24e7e023

avformat/crypto: added encryption · 00d4013d

Christian Suloway authored Dec 01, 2014

Signed-off-by: Christian Suloway <csuloway@globaleagleent.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

00d4013d

01 Dec, 2014 8 commits
- doc: mention the noise_bsf parameter in the docs · 55a06b46
  Christophe Gisquet authored Nov 30, 2014
```
This looks more like a seed than an amount, as the variable name
could lead to think.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  55a06b46
- Merge commit 'e4a77dc2' · 9978916c
  Michael Niedermayer authored Dec 01, 2014
```
* commit 'e4a77dc2':
  Make the RELEASE file match with the most recent tag

Conflicts:
	RELEASE

Not merged as the tag is not a FFmpeg version
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  9978916c
- avcodec/vorbisdec: Use avpriv_float_dsp_alloc() · 51f2422c
  Michael Niedermayer authored Dec 01, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  51f2422c
- avcodec/opus_celt: Use avpriv_float_dsp_alloc() · 00d47591
  Michael Niedermayer authored Dec 01, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  00d47591
- avcodec/wmaprodec: Use avpriv_float_dsp_alloc() · 3384d765
  Michael Niedermayer authored Dec 01, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  3384d765
- avformat/utils: Search harder for missing stream information in flv by default · 24fdf733
  Michael Niedermayer authored Dec 01, 2014
```
Fixes Ticket4133
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  24fdf733
- Make the RELEASE file match with the most recent tag · e4a77dc2
  Reinhard Tartler authored Dec 01, 2014
  
  e4a77dc2
- avcodec/motion_est: use 2x8x8 for interlaced qpel · b50e003e
  Michael Niedermayer authored Dec 01, 2014
```
Fixes out of array read
Fixes Ticket4121
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  b50e003e
30 Nov, 2014 12 commits

doc: correct license template for t2h.pm · 928322c1
Andreas Cadhalpun authored Nov 30, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
928322c1

doc: fix spelling errors · b2865259

Andreas Cadhalpun authored Nov 30, 2014

succesfully => successfully, reproducable => reproducible, specifiying => specifying, isnt => isn't, seperated => separated
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

b2865259

avformat/mxfdec: Reset structural_components_count when allocation fails · 8653419e
Michael Niedermayer authored Nov 30, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
8653419e

libavformat/mxfdec.c: initial support for EssenceGroups · e5d217f0

Mark Reid authored Nov 30, 2014

Previous version reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

e5d217f0

LICENSE.md: Add tests/reference.pnm · 21c0c0f9
Michael Niedermayer authored Nov 30, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
21c0c0f9

Merge commit '' · d828b081

Michael Niedermayer authored Nov 30, 2014

* commit '8895bf7b':
  Replace lena.pnm

Conflicts:
	tests/Makefile
	tests/ref/seek/vsynth2-asv1
	tests/ref/seek/vsynth2-asv2
	tests/ref/seek/vsynth2-ffv1
	tests/ref/seek/vsynth2-flashsv
	tests/ref/seek/vsynth2-flv
	tests/ref/seek/vsynth2-h261
	tests/ref/seek/vsynth2-h263
	tests/ref/seek/vsynth2-h263p
	tests/ref/seek/vsynth2-huffyuv
	tests/ref/seek/vsynth2-ljpeg
	tests/ref/seek/vsynth2-mjpeg
	tests/ref/seek/vsynth2-mpeg1
	tests/ref/seek/vsynth2-mpeg1b
	tests/ref/seek/vsynth2-mpeg2-422
	tests/ref/seek/vsynth2-mpeg2-idct-int
	tests/ref/seek/vsynth2-mpeg2-ilace
	tests/ref/seek/vsynth2-mpeg2-ivlc-qprd
	tests/ref/seek/vsynth2-mpeg2-thread
	tests/ref/seek/vsynth2-mpeg2-thread-ivlc
	tests/ref/seek/vsynth2-mpeg4
	tests/ref/seek/vsynth2-mpeg4-adap
	tests/ref/seek/vsynth2-mpeg4-error
	tests/ref/seek/vsynth2-mpeg4-nr
	tests/ref/seek/vsynth2-mpeg4-qpel
	tests/ref/seek/vsynth2-mpeg4-qprd
	tests/ref/seek/vsynth2-mpeg4-rc
	tests/ref/seek/vsynth2-mpeg4-thread
	tests/ref/seek/vsynth2-msmpeg4
	tests/ref/seek/vsynth2-msmpeg4v2
	tests/ref/seek/vsynth2-roqvideo
	tests/ref/seek/vsynth2-rv10
	tests/ref/seek/vsynth2-rv20
	tests/ref/seek/vsynth2-svq1
	tests/ref/seek/vsynth2-wmv1
	tests/ref/seek/vsynth2-wmv2
	tests/ref/vsynth/vsynth2-asv1
	tests/ref/vsynth/vsynth2-asv2
	tests/ref/vsynth/vsynth2-cljr
	tests/ref/vsynth/vsynth2-dnxhd-1080i
	tests/ref/vsynth/vsynth2-dnxhd-720p
	tests/ref/vsynth/vsynth2-dnxhd-720p-10bit
	tests/ref/vsynth/vsynth2-dnxhd-720p-rd
	tests/ref/vsynth/vsynth2-dv
	tests/ref/vsynth/vsynth2-dv-411
	tests/ref/vsynth/vsynth2-dv-50
	tests/ref/vsynth/vsynth2-ffv1
	tests/ref/vsynth/vsynth2-ffvhuff
	tests/ref/vsynth/vsynth2-flashsv
	tests/ref/vsynth/vsynth2-flv
	tests/ref/vsynth/vsynth2-h261
	tests/ref/vsynth/vsynth2-h263
	tests/ref/vsynth/vsynth2-h263-obmc
	tests/ref/vsynth/vsynth2-h263p
	tests/ref/vsynth/vsynth2-huffyuv
	tests/ref/vsynth/vsynth2-jpegls
	tests/ref/vsynth/vsynth2-ljpeg
	tests/ref/vsynth/vsynth2-mjpeg
	tests/ref/vsynth/vsynth2-mpeg1
	tests/ref/vsynth/vsynth2-mpeg1b
	tests/ref/vsynth/vsynth2-mpeg2
	tests/ref/vsynth/vsynth2-mpeg2-422
	tests/ref/vsynth/vsynth2-mpeg2-idct-int
	tests/ref/vsynth/vsynth2-mpeg2-ilace
	tests/ref/vsynth/vsynth2-mpeg2-ivlc-qprd
	tests/ref/vsynth/vsynth2-mpeg2-thread
	tests/ref/vsynth/vsynth2-mpeg2-thread-ivlc
	tests/ref/vsynth/vsynth2-mpeg4
	tests/ref/vsynth/vsynth2-mpeg4-adap
	tests/ref/vsynth/vsynth2-mpeg4-adv
	tests/ref/vsynth/vsynth2-mpeg4-error
	tests/ref/vsynth/vsynth2-mpeg4-nr
	tests/ref/vsynth/vsynth2-mpeg4-qpel
	tests/ref/vsynth/vsynth2-mpeg4-qprd
	tests/ref/vsynth/vsynth2-mpeg4-rc
	tests/ref/vsynth/vsynth2-mpeg4-thread
	tests/ref/vsynth/vsynth2-msmpeg4
	tests/ref/vsynth/vsynth2-msmpeg4v2
	tests/ref/vsynth/vsynth2-prores
	tests/ref/vsynth/vsynth2-qtrle
	tests/ref/vsynth/vsynth2-rgb
	tests/ref/vsynth/vsynth2-roqvideo
	tests/ref/vsynth/vsynth2-rv10
	tests/ref/vsynth/vsynth2-rv20
	tests/ref/vsynth/vsynth2-svq1
	tests/ref/vsynth/vsynth2-v210
	tests/ref/vsynth/vsynth2-wmv1
	tests/ref/vsynth/vsynth2-wmv2
	tests/ref/vsynth/vsynth2-yuv

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

d828b081

Merge commit '' · 79440651

Michael Niedermayer authored Nov 30, 2014

* commit '0f257e29':
  Treat all '*.pnm' files as non-text file
Merged-by: Michael Niedermayer <michaelni@gmx.at>

79440651

ffmpeg: take bsf arguments from the command line · 4c592c39

Christophe Gisquet authored Nov 29, 2014

The format is now:
-bsf:X filter1[=opt1=str1/opt2=str2],filter2
ie the parameters are appended after the filter name using '='. As ','
has been reserved already for the list of filters, '/' is just an
example of token separation for now, but that could become part of the
API to avoid each bsf using its own tokenization.

The proper solution would be using AVOption, but this is overkill for now.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

4c592c39

avcodec/adxenc: fix rounding · 0b5adc35
Michael Niedermayer authored Nov 30, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
0b5adc35
avcodec/adxenc: match prediction used in the decoder · 6b0ab561
Michael Niedermayer authored Nov 30, 2014
```
The prediction used in the encoder was not correct
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
6b0ab561
avcodec/atrac3: Use avpriv_float_dsp_alloc() · 93f959b6
Michael Niedermayer authored Nov 30, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
93f959b6
avcodec/libmp3lame: Use avpriv_float_dsp_alloc() · 1aca990b
Michael Niedermayer authored Nov 30, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
1aca990b