Commits · dd3f1563d7666b631035644ea690c20b00ec91de · Linshizhi / ffmpeg.wasm-core

21 Oct, 2014 27 commits

Michael Niedermayer authored Oct 21, 2014

* commit 'b69183f6':
  nutenc: check for negative index rather than assert

Conflicts:
	libavformat/nutenc.c

Not merged, the assert is correct
Merged-by: Michael Niedermayer <michaelni@gmx.at>

dd3f1563

Merge commit '' · 979062fe

Michael Niedermayer authored Oct 21, 2014

* commit 'be42c0b8':
  rmdec: stricter error check to avoid theoretical unitialized use

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

979062fe

Merge commit '' · 840bc8e2

Michael Niedermayer authored Oct 21, 2014

* commit '7207dd8f':
  rmdec: check av_new_packet return value

Conflicts:
	libavformat/rmdec.c

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

840bc8e2

lavd/fbdev_common: report error during probing fbdev device · 6aa1cfed
Lukasz Marek authored Oct 18, 2014
```
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
```
6aa1cfed
lavd/fbdev_dec: use default device when not provided · da833a6d
Lukasz Marek authored Oct 18, 2014
```
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
```
da833a6d

Merge commit '' · 3099008f

Michael Niedermayer authored Oct 21, 2014

* commit '629b2ed0':
  flvdec: make sure to check create_stream and report the same error

Conflicts:
	libavformat/flvdec.c

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

3099008f

Merge commit '' · 1922357e

Michael Niedermayer authored Oct 21, 2014

* commit 'f22aa6b8':
  flvdec: avoid unitialized use of a struct member

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

1922357e

Merge commit '' · 45426150

Michael Niedermayer authored Oct 21, 2014

* commit 'e73d26bb':
  smoothstreamingenc: explict cast to avoid overflow

Conflicts:
	libavformat/smoothstreamingenc.c

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

45426150

Merge commit '' · 2f74b8d0

Michael Niedermayer authored Oct 21, 2014

* commit '04d8af5f':
  fate-mpeg4: use TARGET_SAMPLES for resize tests

Conflicts:
	tests/fate/mpeg4.mak

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

2f74b8d0

avcodec/mjpegdec: simplify chroma_height calculation · d5a3a20d
Michael Niedermayer authored Oct 21, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
d5a3a20d

mov.c: reasonable bitrate for fragmented mp4 · 17702f1f

Mika Raento authored Oct 21, 2014

If using MFRA for timestamps, the stream may start from a large offset
and/or have gaps. With this change we calculate the bitrate based on
frames we've seen.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

17702f1f

avcodec/mjpegdec: Support 24111100 pix fmt id · 059c8428
Michael Niedermayer authored Oct 21, 2014
```
Fixes 129533924_640.jpg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
059c8428
nutenc: check for negative index rather than assert · b69183f6
Vittorio Giovara authored Oct 20, 2014
```
CC: libav-stable@libav.org
Bug-Id: CID 703721
```
b69183f6
rmdec: stricter error check to avoid theoretical unitialized use · be42c0b8
Vittorio Giovara authored Oct 20, 2014
```
CC: libav-stable@libav.org
Bug-Id: CID 90558
```
be42c0b8
rmdec: check av_new_packet return value · 7207dd8f
Vittorio Giovara authored Oct 20, 2014
```
CC: libav-stable@libav.org
Bug-Id: CID 733714
```
7207dd8f
flvdec: make sure to check create_stream and report the same error · 629b2ed0
Vittorio Giovara authored Oct 20, 2014
```
CC: libav-stable@libav.org
Bug-Id: CID 732242
```
629b2ed0
flvdec: avoid unitialized use of a struct member · f22aa6b8
Vittorio Giovara authored Oct 20, 2014
```
CC: libav-stable@libav.org
Bug-Id: CID 718141
```
f22aa6b8
smoothstreamingenc: explict cast to avoid overflow · e73d26bb
Vittorio Giovara authored Oct 20, 2014
```
CC: libav-stable@libav.org
Bug-Id: CID 732248
```
e73d26bb
doc/ffmpeg.texi: document the new -start_at_zero option · 1372c557
Rodger Combs authored Oct 21, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
1372c557
lavfi/concat: accept a single segment · 843d7bb3
Stefano Sabatini authored Oct 21, 2014
```
Simplify scripting operations, so that n=1 is not to be considered as a
special case.
```
843d7bb3
lavfi/afade: fix cur_sample computation · 7ba2e134
Stefano Sabatini authored Oct 21, 2014
```
Use the correct timebase conversion.
```
7ba2e134
lavf/mov.c: Prevent memory leak in case of invalid metadata reads. · 6e6b79e7
Thilo Borgmann authored Oct 21, 2014
```
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
6e6b79e7
fate-mpeg4: use TARGET_SAMPLES for resize tests · 04d8af5f
Janne Grunau authored Oct 21, 2014

04d8af5f
avformat/rtsp: Use ff_rtsp_averror() · 282c9354
Andrey Utkin authored Oct 17, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
282c9354

avformat/rtspcodes: introduce ff_rtsp_averror() · 24dfd6e7

Andrey Utkin authored Oct 17, 2014

Currently this is another name for ff_http_averror()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

24dfd6e7

ffmpeg_opt: Add -start_at_zero option. · 315f9e92

Rodger Combs authored Oct 20, 2014

This automatically shifts input timestamps to start at 0 instead of the file's
starting timestamp when using -copyts.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

315f9e92

avcodec/libutvideodec: print extradata size if unsupported · 832b4c0a
Michael Niedermayer authored Oct 19, 2014
```
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
832b4c0a

20 Oct, 2014 13 commits

Merge commit '' · cec4e1c7

Michael Niedermayer authored Oct 20, 2014

* commit 'd2771a1d':
  rtpproto: Free the addrinfo pointer on failure
Merged-by: Michael Niedermayer <michaelni@gmx.at>

cec4e1c7

Merge commit '' · 5753d967

Michael Niedermayer authored Oct 20, 2014

* commit '96bfb677':
  nutdec: Prevent a memory corruption

Conflicts:
	libavformat/nutdec.c

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

5753d967

Merge commit '' · e162db66

Michael Niedermayer authored Oct 20, 2014

* commit '350ed182':
  rtpdec_hevc: drop unnecessary check
Merged-by: Michael Niedermayer <michaelni@gmx.at>

e162db66

Merge commit '' · 20d3348e

Michael Niedermayer authored Oct 20, 2014

* commit '322b571d':
  rtmpproto: remove dead code

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

20d3348e

Merge commit '' · 2e0ac145

Michael Niedermayer authored Oct 20, 2014

* commit 'd1afd3e1':
  vf_format: check input validity

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

2e0ac145

lavd: export all symbols with av_ prefix · e493814d
Lukasz Marek authored Oct 20, 2014
```
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
```
e493814d

Merge commit '' · 6ef4e0c8

Michael Niedermayer authored Oct 20, 2014

* commit '7b48bf95':
  wtv: clean memory on error

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

6ef4e0c8

Merge commit '' · c04f125b

Michael Niedermayer authored Oct 20, 2014

* commit '9fbc613f':
  wtv: check seek_by_sector return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>

c04f125b

Merge commit '' · 36552345

Michael Niedermayer authored Oct 20, 2014

* commit 'd7f530b0':
  aviobuf: check context before using it

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

36552345

Merge commit '' · 54112629

Michael Niedermayer authored Oct 20, 2014

* commit '02484d1a':
  avio: fix sizeof argument

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

54112629

Merge commit '' · ab077b3d

Michael Niedermayer authored Oct 20, 2014

* commit '8ab3b71e':
  idcin: fix return check

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

ab077b3d

configure: fix bug to ensure that HAVE_VSX is only enabled when HAVE_ALTIVEC... · a001db2e

Rong Yan authored Oct 13, 2014

configure: fix bug to ensure that HAVE_VSX is only enabled when HAVE_ALTIVEC is enabled and in LE environment
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

a001db2e

lavf/mov.c: Allocate buffer in case of long metadata entries. · f31445a8
Thilo Borgmann authored Oct 20, 2014
```
Fixes ticket #4018
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
f31445a8