Commits · 15fbf3e72a643b6b3d32ab6fa687ca2ca3d2fde1 · Linshizhi / ffmpeg.wasm-core

19 Jul, 2015 20 commits

Michael Niedermayer authored Jul 19, 2015

* commit 'ab7b0389':
  avconv: factor out the output stream initialization

Conflicts:
	ffmpeg.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

15fbf3e7

Merge commit '' · edd110ee

Michael Niedermayer authored Jul 19, 2015

* commit 'bd2ab27c':
  avconv: use read_file() for reading the 2pass stats

Conflicts:
	cmdutils.c
	cmdutils.h
	ffmpeg_opt.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

edd110ee

Merge commit '' · 247f4d1f

Michael Niedermayer authored Jul 19, 2015

* commit '6d5d9246':
  avconv: move handling the 2pass logfile into avconv_opt

Conflicts:
	ffmpeg.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

247f4d1f

Merge commit '' · db3e12a8

Michael Niedermayer authored Jul 19, 2015

* commit '59245e0c':
  avconv: set the encoding/decoding_needed flags earlier

Conflicts:
	ffmpeg.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

db3e12a8

ffmpeg_opt: Fix stream copy flag for attachments · 843be56e
Michael Niedermayer authored Jul 19, 2015
```
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
843be56e

Merge commit '' · 8534c8c7

Michael Niedermayer authored Jul 19, 2015

* commit '56c2f377':
  avconv: drop update_sample_fmt()

Conflicts:
	ffmpeg.c

No change as the removed code is not in FFmpeg
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

8534c8c7

Merge commit '' · 3d4297f8

Michael Niedermayer authored Jul 19, 2015

* commit 'e61f3984':
  asfdec: make nb_sub to be unsigned int
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

3d4297f8

Merge commit '' · 74aba007

Michael Niedermayer authored Jul 19, 2015

* commit '2883ef34':
  asfdec: read the replicated data in a separate function
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

74aba007

Merge commit '' · 80a37fc3

Michael Niedermayer authored Jul 19, 2015

* commit '0989d3ad':
  asfdec: convert condition for the replicated data reading to be safer
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

80a37fc3

Merge commit '' · f509c950

Michael Niedermayer authored Jul 19, 2015

* commit '40662728':
  asfdec: do not read replicated data when their length is 0
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

f509c950

avconv: factor out the output stream initialization · ab7b0389
Anton Khirnov authored Jun 28, 2015

ab7b0389

avconv: use read_file() for reading the 2pass stats · bd2ab27c

Anton Khirnov authored Jun 28, 2015

Also, drop the now unused cmdutils_read_file(). There is no reason to
have two functions doing essentially the same thing.

bd2ab27c

avconv: move handling the 2pass logfile into avconv_opt · 6d5d9246
Anton Khirnov authored Jun 28, 2015
```
It more logically belongs there.
```
6d5d9246
avconv: set the encoding/decoding_needed flags earlier · 59245e0c
Anton Khirnov authored Jun 28, 2015
```
This will be useful in the following commits.
```
59245e0c

avconv: drop update_sample_fmt() · 56c2f377

Anton Khirnov authored Jun 28, 2015

There is only one decoder left that supports this (libopus, which is not
used by default since we have a native one) and this code goes against
the avconv design, since it propagates information back from the encoder
to decoder.

56c2f377

asfdec: make nb_sub to be unsigned int · e61f3984

Alexandra Hájková authored Jul 17, 2015

number of subpayloads should be always positive
Signed-off-by: Anton Khirnov <anton@khirnov.net>

e61f3984

asfdec: read the replicated data in a separate function · 2883ef34
Alexandra Hájková authored Jul 17, 2015
```
Signed-off-by: Anton Khirnov <anton@khirnov.net>
```
2883ef34
asfdec: convert condition for the replicated data reading to be safer · 0989d3ad
Alexandra Hájková authored Jul 17, 2015
```
Signed-off-by: Anton Khirnov <anton@khirnov.net>
```
0989d3ad
asfdec: do not read replicated data when their length is 0 · 40662728
Alexandra Hájková authored Jul 17, 2015
```
Signed-off-by: Anton Khirnov <anton@khirnov.net>
```
40662728
avcodec/hevc_parser: Treat extradata parsing differently, as it should not contain an AU · 54882156
Michael Niedermayer authored Jul 19, 2015
```
Fixes ticket4718
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
54882156

18 Jul, 2015 20 commits

avutil/x86/bswap: force inline asm versions with ICC · bd487645

James Almer authored Jul 18, 2015

Recent ICC versions that define GCC as >= 4.5 (like ICC 13) apparently can't
optimize the generic C versions of av_bswap*() on their own.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>

bd487645

avutil/intmath: check for ICC before GCC · 78347549

James Almer authored Jul 18, 2015

Intel compiler also defines __GNUC__, so the Intel specific intrinsics were not
really being used.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>

78347549

avfilter/vf_blend: unbreak tblend · 9a829a2b
Paul B Mahol authored Jul 18, 2015
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
9a829a2b
fate: add tblend filter test · 5c7f7086
Paul B Mahol authored Jul 18, 2015
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
5c7f7086
avformat/mpegtsenc: Add sdt_period, similar to pat_period · b5e716ae
Michael Niedermayer authored Jul 18, 2015
```
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
b5e716ae
avformat/mpegtsenc: Support a user specified PAT/PMT period · 34da54fd
Michael Niedermayer authored Jul 16, 2015
```
Can be used to fix Ticket3714
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
34da54fd
avformat/mpegtsenc: support storing PAT/PMT per frame · a9c1545a
Michael Niedermayer authored Jul 15, 2015
```
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
a9c1545a

doc/developer: add url for sample files · e3e4f175

Ganesh Ajjanagadde authored Jul 18, 2015

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

e3e4f175

avfilter/vf_blend: implement 16bit support · efd4e5fe
Paul B Mahol authored Jul 15, 2015
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
efd4e5fe
fate: add test for mergeplanes filter · e03cb1e1
Paul B Mahol authored Jul 17, 2015
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
e03cb1e1

avcodec/vp8: Check buffer size in vp8_decode_frame_header() · 599d746e

Michael Niedermayer authored Jul 18, 2015

avoids null pointer dereference
Fixes: signal_sigsegv_d5de40_964_vp80-00-comprehensive-010.ivf with memlimit of 1048576

Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

599d746e

avcodec/vp8: Fix null pointer dereference in ff_vp8_decode_free() · a84f0e8d

Michael Niedermayer authored Jul 18, 2015

Fixes: signal_sigsegv_d5de23_967_vp80_00_comprehensive_010.ivf with memlimit 524288

Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

a84f0e8d

avcodec/diracdec: Check for hpel_base allocation failure · 1c5b712c

Michael Niedermayer authored Jul 18, 2015

Fixes null pointer dereference
Fixes: signal_sigsegv_b02a96_280_RL_420p_ffdirac.drc with memlimit of 67108864

Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

1c5b712c

avformat/movenc: Drop redundant bit exact field from context · a1942989
Michael Niedermayer authored Jul 18, 2015
```
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
a1942989

avcodec/rv34: Clear pointers in ff_rv34_decode_init_thread_copy() · 3197c0aa

Michael Niedermayer authored Jul 18, 2015

Avoids leaving stale pointers
Fixes: signal_sigabrt_7ffff70eccc9_819_sabtriple.rm with memlimit 536870912

Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

3197c0aa

avutil/frame: Update AVFrame docs library references · 129785b5

Michael Niedermayer authored Jul 18, 2015

These where apparently forgotten when AVFrames where moved into libavutil
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

129785b5

avfilter/af_dynaudnorm: Use av_frame_get_channels() · 2927b61c
Michael Niedermayer authored Jul 18, 2015
```
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
2927b61c
avcodec/hevc_ps: Also print depth in failure path of map_pixel_format() · f8e4d379
Michael Niedermayer authored Jul 18, 2015
```
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
f8e4d379

avformat: increase first_frames threshold for mp3,ac3 · f6870495

Ganesh Ajjanagadde authored Jul 18, 2015

Fixes Ticket4723
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

f6870495

Merge commit '' · 9010be25

Michael Niedermayer authored Jul 18, 2015

* commit 'c9f8cfb6':
  fate: add checkasm target
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

9010be25