Commits · 0460b9bb3e34472223084a6c3ad35b4ded9c276b · Linshizhi / ffmpeg.wasm-core

29 Oct, 2013 27 commits

Michael Niedermayer authored Oct 29, 2013

* commit 'c872d310':
  avconv: stop accessing AVStream.parser

Conflicts:
	ffmpeg.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

0460b9bb

avutil/opt: fix flags check on non x86 · 15b1b088
Michael Niedermayer authored Oct 29, 2013
```
This should fix several fate failures
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
15b1b088

Merge commit '' · 249cc58c

Michael Niedermayer authored Oct 29, 2013

* commit '8b64c2ba':
  lavc: add a dummy field to AVStream to preserve ABI compatibility for avconv
Merged-by: Michael Niedermayer <michaelni@gmx.at>

249cc58c

lavf: remove unreliable timestamp guessing heuristic · 4eb49fdd
Anton Khirnov authored Oct 27, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
4eb49fdd

Merge commit '' · e166b82d

Michael Niedermayer authored Oct 29, 2013

* commit '25c7db7c':
  avio: Check for memory allocation failure of private data

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

e166b82d

Merge commit '' · 42bf156e

Michael Niedermayer authored Oct 29, 2013

* commit '327c439f':
  timefilter: Handle memory allocation failure

Conflicts:
	libavdevice/jack_audio.c
	libavdevice/timefilter.c

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

42bf156e

Merge commit '' · 6c5f17e7

Michael Niedermayer authored Oct 29, 2013

* commit 'e7891305':
  configure: Provide an hardened toolchain option
Merged-by: Michael Niedermayer <michaelni@gmx.at>

6c5f17e7

Merge commit '' · df69af4e

Michael Niedermayer authored Oct 29, 2013

* commit 'dcd3eda6':
  configure: Move gcc-only -W option where it belongs
Merged-by: Michael Niedermayer <michaelni@gmx.at>

df69af4e

avformat/avisynth: re-add trailing \n. · 8d55362f
Clément Bœsch authored Oct 29, 2013
```
Regression since ac9529ce.

Spotted by Timothy Gu.
```
8d55362f
lavc/mpegvideo_enc: fix typo · d4ac3e59
Stefano Sabatini authored Oct 29, 2013

d4ac3e59
lavc: extend documentation for the "bf" option · 9fa0dccc
Stefano Sabatini authored Oct 29, 2013

9fa0dccc

doc/muxers: add definitory line for the MOV/MP4/ISMV muxer · 61c1f2cb

Stefano Sabatini authored Oct 29, 2013

Also rename section name, to match the other ones adopting the muxer name
(rather than the related upcased standard name).

61c1f2cb

avcodec/mpegvideo_enc: check that max_b_frames is not negative · ce55e667
Michael Niedermayer authored Oct 29, 2013
```
Fixes crash found by saste
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
ce55e667
matroskaenc: fixed display width / height calculation for stereo mode · 6103faaa
Michael Niedermayer authored Oct 29, 2013
```
Based-on: patch by Asan Usipov <asan.usipov@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
6103faaa
avconv: stop accessing AVStream.parser · c872d310
Anton Khirnov authored Oct 28, 2013
```
It is private and must not be touched from outside of lavf.
```
c872d310

lavc: add a dummy field to AVStream to preserve ABI compatibility for avconv · 8b64c2ba

Anton Khirnov authored Oct 28, 2013

avconv abuses the API by accessing AVStream.parser (which is private).
Removing AVStream.reference_dts in
2ba68dd0 breaks ABI compatibility for an
old avconv using a newer lavf. Fix this by adding a dummy field until
the next bump.

8b64c2ba

h264: Check all allocations · a483aae7
Derek Buitenhuis authored Oct 22, 2013
```
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
```
a483aae7
avio: Check for memory allocation failure of private data · 25c7db7c
Derek Buitenhuis authored Oct 22, 2013
```
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
```
25c7db7c
timefilter: Handle memory allocation failure · 327c439f
Derek Buitenhuis authored Oct 22, 2013
```
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
```
327c439f
timefilter: Fix typo in allocation failure message · 069ceea7
Derek Buitenhuis authored Oct 29, 2013
```
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
```
069ceea7

Merge remote-tracking branch 'qatar/master' · 325f6e0a

Michael Niedermayer authored Oct 29, 2013

* qatar/master:
  lavfi: do not export the filters from shared objects

Conflicts:
	libavfilter/af_amix.c
	libavfilter/af_anull.c
	libavfilter/asrc_anullsrc.c
	libavfilter/f_select.c
	libavfilter/f_settb.c
	libavfilter/split.c
	libavfilter/src_movie.c
	libavfilter/vf_aspect.c
	libavfilter/vf_blackframe.c
	libavfilter/vf_colorbalance.c
	libavfilter/vf_copy.c
	libavfilter/vf_crop.c
	libavfilter/vf_cropdetect.c
	libavfilter/vf_drawbox.c
	libavfilter/vf_format.c
	libavfilter/vf_framestep.c
	libavfilter/vf_frei0r.c
	libavfilter/vf_hflip.c
	libavfilter/vf_libopencv.c
	libavfilter/vf_lut.c
	libavfilter/vf_null.c
	libavfilter/vf_overlay.c
	libavfilter/vf_scale.c
	libavfilter/vf_transpose.c
	libavfilter/vf_unsharp.c
	libavfilter/vf_vflip.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

325f6e0a

configure: Provide an hardened toolchain option · e7891305
Luca Barbato authored Oct 28, 2013

e7891305
configure: Move gcc-only -W option where it belongs · dcd3eda6
Luca Barbato authored Oct 28, 2013

dcd3eda6

Merge commit '' · d3e13250

Michael Niedermayer authored Oct 29, 2013

* commit 'feeafb4a':
  lavf: do not export av_register_{rtp,rdt}_dynamic_payload_handlers from shared objects
Merged-by: Michael Niedermayer <michaelni@gmx.at>

d3e13250

avcodec/audioconvert: deprecate API · e3623196

Michael Niedermayer authored Oct 29, 2013

Note, the header was not installed so useage of this should be limited
but its not 0, there are some random pieces of code using it according
to google.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

e3623196

avcodec/cook: use av_freep() · 66518f6f
Paul B Mahol authored Oct 29, 2013
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
66518f6f

Merge commit '' · 6bf4edec

Michael Niedermayer authored Oct 29, 2013

* commit 'c9a13a28':
  lavc: remove old unused audio conversion functions.

Conflicts:
	libavcodec/audioconvert.c
	libavcodec/audioconvert.h

Merge only for metadata.
keeping the old API longer reduces the need for applications to be continuously
updated.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

6bf4edec

28 Oct, 2013 13 commits
- avformat/gxf: fix old codec id · f1f0b01c
  Michael Niedermayer authored Oct 28, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  f1f0b01c
- avcodec: fix old codec ids · e510171f
  Michael Niedermayer authored Oct 28, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  e510171f
- avcodec/dvdec: dont try to decode ac when theres no input · f0b26bf0
  Michael Niedermayer authored Oct 28, 2013
```
fixes reading out of an empty bitstream
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  f0b26bf0
- avisynth: Factor out a couple of returns · f87a2e12
  Stephen Hutchinson authored Oct 28, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  f87a2e12
- avisynth: Simplify a stray av_log message · ac9529ce
  Stephen Hutchinson authored Oct 28, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  ac9529ce
- avisynth: Switch a couple of AVERROR_UNKNOWNs to AVERROR(ENOMEM) · 7ac67583
  Stephen Hutchinson authored Oct 28, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  7ac67583
- avisynth: Use AV_* prefixes for video and audio IDs · c7f9aab8
  Stephen Hutchinson authored Oct 28, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  c7f9aab8
- avisynth: Remove outdated undef block · cf31c1d4
  Stephen Hutchinson authored Oct 28, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  cf31c1d4
- avisynth: Remove a couple of useless AviSynthContext casts · df6279e7
  Stephen Hutchinson authored Oct 28, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  df6279e7
- avisynth: Don't declare structs anonymously · da985267
  Stephen Hutchinson authored Oct 28, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  da985267
- avisynth: Compact AvxSynth's avoidance of 2.6's colorspaces. · d10d60be
  Stephen Hutchinson authored Oct 28, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  d10d60be
- avisynth: Cosmetics · 2c18bfe6
  Stephen Hutchinson authored Oct 28, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  2c18bfe6
- avisynth: Change most of the comments to /* */ from // · 1549122d
  Stephen Hutchinson authored Oct 28, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  1549122d