Commits · 7125b6ca90d4085832a0fa7e37f684181eb89094 · Linshizhi / ffmpeg.wasm-core

08 Jul, 2014 30 commits

avformat/segment: remove gettimeofday() use, remove sys/time.h · 7125b6ca

Michael Niedermayer authored Jul 08, 2014

It causes portability issues, and would need ifdef hell if its kept

Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

7125b6ca

alpha/idctdsp: move idct init code out of dsputil · 2375b094

James Almer authored Jul 08, 2014

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

2375b094

avformat/mpegts: pass MpegTSContext ptr explicitly (fixes #3721) · 86359543

Alexander V. Lukyanov authored Jul 08, 2014

AVFormatContext->priv_data is not always a MpegTSContext, it can be
RTSPState when decoding a RTP stream. So it is necessary to pass
MpegTSContext pointer explicitly.

This fixes memory corruption from bug #3721 (RTSPState is smaller than
MpegTSContext thus innocent memory gets overwritten).
Signed-off-by: Alexander V. Lukyanov <lavv17f@gmail.com>
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

86359543

Merge commit '' · fd3388d6

Michael Niedermayer authored Jul 08, 2014

* commit '18fb38fb':
  mov: Remove a variable that is set but never used

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

fd3388d6

Merge commit '' · 839688bc

Michael Niedermayer authored Jul 08, 2014

* commit 'cf280ed0':
  avplay: Handle pixel aspect ratio properly

See: 32fdfdfb
See: 99b01e45
See: 825ec16dMerged-by: Michael Niedermayer <michaelni@gmx.at>

839688bc

Merge commit '' · a26ecba0

Michael Niedermayer authored Jul 08, 2014

* commit '52a1c32c':
  nut: Use nut->version in the version range check

Conflicts:
	libavformat/nutdec.c

Note, this bug did not affect ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>

a26ecba0

avdevice/lavfi: add io.h, should fix msvc build · eee6ad38
Michael Niedermayer authored Jul 08, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
eee6ad38

avcodec/alpha/dsputil_alpha: fix build · 550bda74

Michael Niedermayer authored Jul 08, 2014

Disable moved functions to prevent build/test failure,
patch to update and re-enable them is welcome
volunteer to maintain the alpha code is welcome too
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

550bda74

mov: Remove a variable that is set but never used · 18fb38fb
Martin Storsjö authored Jul 07, 2014
```
This silences a warning with gcc.
Signed-off-by: Martin Storsjö <martin@martin.st>
```
18fb38fb

avplay: Handle pixel aspect ratio properly · cf280ed0

Martin Storsjö authored Jul 06, 2014

This was broken (left half-implemented) in 354468fc.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

cf280ed0

nut: Use nut->version in the version range check · 52a1c32c
Luca Barbato authored Jul 07, 2014
```
It was wrongly left unchanged when the version field had been
introduced. (c94e2e85)
```
52a1c32c
avcodec/proresenc_anatoliy: check against maximum dimensions · 7cb8f7de
Michael Niedermayer authored Jul 08, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
7cb8f7de
avcodec/roqvideoenc: check dimensions against maximum · 7c7441b3
Michael Niedermayer authored Jul 08, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
7c7441b3

avcodec/roqvideoenc: fix infinite lambda increasing loop · fe4c76b3

Michael Niedermayer authored Jul 08, 2014

The threshold was choosen so that no further size decrease happened with larger lambda
with the test video.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

fe4c76b3

avformat/nutdec: if all else fails try to lookup video tag in isom · a981d1b6
Michael Niedermayer authored Jul 08, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
a981d1b6
avformat/movenc: check that the video resolution is supported · 5a4edf6f
Michael Niedermayer authored Jul 08, 2014
```
Resolutions are stored as 16bit integers
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
5a4edf6f

Merge commit '' · 1f935c3d

Michael Niedermayer authored Jul 08, 2014

* commit '79fce1ec':
  arm: Avoid using the 'setend' instruction on ARMv7 and newer

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

1f935c3d

Merge commit '' · 70b423e1

Michael Niedermayer authored Jul 08, 2014

* commit '3d90f27a':
  avformat_new_stream: make the AVCodec parameter const

Conflicts:
	libavformat/utils.c

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

70b423e1

Merge commit '' · e1f729d9

Michael Niedermayer authored Jul 08, 2014

* commit 'd3cfd7af':
  af_compand: make sure request_frame always outputs at least one frame

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

e1f729d9

arm: Avoid using the 'setend' instruction on ARMv7 and newer · 79fce1ec

Martin Storsjö authored Jul 04, 2014

This instruction is deprecated on ARMv8, and it is serializing on
some ARMv7 cores as well [1].

[1] http://article.gmane.org/gmane.linux.ports.arm.kernel/339293

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

79fce1ec

avformat_new_stream: make the AVCodec parameter const · 3d90f27a
Roman Savchenko authored Jul 08, 2014
```
Signed-off-by: Anton Khirnov <anton@khirnov.net>
```
3d90f27a

af_compand: make sure request_frame always outputs at least one frame · d3cfd7af

Andrew Kelley authored Jul 06, 2014

This fixes a segmentation fault because request_frame in fifo.c assumes
that the call to ff_request_frame will populate fifo->root.next.
Before, it was possible for request_frame in af_compand to not do this,
resulting in a null pointer access. Now, request_frame in af_compand
always will return at least one frame or an error, as per the API
specifications in avfilter.h for request_frame.
Signed-off-by: Anton Khirnov <anton@khirnov.net>

d3cfd7af

Merge commit '' · 14e2406d

Michael Niedermayer authored Jul 08, 2014

* commit 'a9aee08d':
  dsputil: Split off FDCT bits into their own context

Conflicts:
	configure
	libavcodec/Makefile
	libavcodec/asvenc.c
	libavcodec/dnxhdenc.c
	libavcodec/dsputil.c
	libavcodec/mpegvideo.h
	libavcodec/mpegvideo_enc.c
	libavcodec/x86/Makefile
	libavcodec/x86/dsputilenc_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

14e2406d

avcodec/crystalhd: Add #if HAVE_UNISTD_H around #include <unistd.h> · 5c7bf354
Michael Niedermayer authored Jul 08, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
5c7bf354
avutil/cpu: Use HAVE_UNISTD_H instead of HAVE_SYSCONF for #include <unistd.h> · 0ffba9fe
Michael Niedermayer authored Jul 08, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
0ffba9fe
avfilter/vf_drawtext: Add #if HAVE_UNISTD_H around #include <unistd.h> · 576ced55
Michael Niedermayer authored Jul 08, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
576ced55
avdevice/oss_audio: Add #if HAVE_UNISTD_H around #include <unistd.h> · 0dbcecc8
Michael Niedermayer authored Jul 08, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
0dbcecc8

doc: add doxygen target tag · 8e6a66b6

Timothy Gu authored Jul 07, 2014

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

8e6a66b6

doc: make doxygen program configurable · cee98aad

Timothy Gu authored Jul 07, 2014

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

cee98aad

doc: add doxy-wrapper.sh to doc/doxygen/html dependencies · 865a7610

Timothy Gu authored Jul 07, 2014

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

865a7610

07 Jul, 2014 10 commits
- ffserver: add HAVE_UNISTD_H around #include <unistd.h> · 307239bd
  Michael Niedermayer authored Jul 07, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  307239bd
- tools/yuvcmp: add HAVE_UNISTD_H around #include <unistd.h> · 1574eedd
  Michael Niedermayer authored Jul 07, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  1574eedd
- avcodec/libxvid: add HAVE_UNISTD_H around #include <unistd.h> · 39ea2171
  Michael Niedermayer authored Jul 07, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  39ea2171
- protect unistd.h with #if HAVE_UNISTD_H in code from recent av_bprint_fd_contents() patches · 0ebcf878
  Michael Niedermayer authored Jul 07, 2014
```
Should fix build failure on MSVC
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  0ebcf878
- swresample: misc. doxy improvements · 5b58692e
  Timothy Gu authored Jul 07, 2014
```
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  5b58692e
- doc/Doxyfile: use 5 columns for alphabetical index · 9ccc7aee
  Michael Niedermayer authored Jul 07, 2014
```
This reverts a hunk from 67100555
Reduces diff to what we use on the server
Suggested-by: Timothy Gu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  9ccc7aee
- Merge commit '1e9a93bf' · 242b3c29
  Michael Niedermayer authored Jul 07, 2014
```
* commit '1e9a93bf':
  libfdk-aacdec: Decode the first AAC frame to reliably identify the bitstream

Conflicts:
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  242b3c29
- Merge commit 'a863c97e' · 75be508f
  Michael Niedermayer authored Jul 07, 2014
```
* commit 'a863c97e':
  smoothstreamingenc: Fix a memory leak on errors

See: a53c5d45Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  75be508f
- avcodec/vmdvideo: remove unneeded include · 154954c2
  Michael Niedermayer authored Jul 07, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  154954c2
- avformat/segment: simplify localtime* use · b8d017ad
  Michael Niedermayer authored Jul 07, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  b8d017ad