Commits · 1fa7d0902c3eef6fc17f253b5e90c77167483458 · Linshizhi / ffmpeg.wasm-core

20 Apr, 2015 9 commits

Michael Niedermayer authored Apr 20, 2015

* commit '5b5338f6':
  hqx: Implement slice-threaded decoding

Conflicts:
	libavcodec/hqx.c
	libavcodec/hqx.h

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

1fa7d090

Merge commit '' · 55b866f6

Michael Niedermayer authored Apr 20, 2015

* commit '453642f8':
  hqx: Store shareable data in main decoder context

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

55b866f6

Merge commit '' · d8b4e9ad

Michael Niedermayer authored Apr 20, 2015

* commit 'ea031b75':
  hqx: Move DSP related code to a separate file

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

d8b4e9ad

Merge commit '' · 73e6af9d

Michael Niedermayer authored Apr 20, 2015

* commit '17aa81d9':
  hqx: Merge invalid format check within switch block

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

73e6af9d

avcodec/internal: Fix ff_dlog() define like av_dlog() · dbd94b77
Michael Niedermayer authored Apr 20, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
dbd94b77
avcodec: fix build with DEBUG/TRACE · 0a582aee
Michael Niedermayer authored Apr 20, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
0a582aee

Merge commit '' · 8f7b022c

Michael Niedermayer authored Apr 20, 2015

* commit '6a85dfc8':
  lavc: Replace av_dlog and tprintf with internal macros

Conflicts:
	libavcodec/aacdec.c
	libavcodec/audio_frame_queue.c
	libavcodec/bitstream.c
	libavcodec/dcadec.c
	libavcodec/dnxhddec.c
	libavcodec/dvbsubdec.c
	libavcodec/dvdec.c
	libavcodec/dvdsubdec.c
	libavcodec/get_bits.h
	libavcodec/gifdec.c
	libavcodec/h264.h
	libavcodec/h264_cabac.c
	libavcodec/h264_cavlc.c
	libavcodec/h264_loopfilter.c
	libavcodec/h264_refs.c
	libavcodec/imc.c
	libavcodec/interplayvideo.c
	libavcodec/jpeglsdec.c
	libavcodec/libopencore-amr.c
	libavcodec/mjpegdec.c
	libavcodec/mpeg12dec.c
	libavcodec/mpegvideo_enc.c
	libavcodec/mpegvideo_parser.c
	libavcodec/pngdec.c
	libavcodec/ratecontrol.c
	libavcodec/rv10.c
	libavcodec/svq1dec.c
	libavcodec/vqavideo.c
	libavcodec/wmadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

8f7b022c

Merge commit '' · 40d552da

Michael Niedermayer authored Apr 20, 2015

* commit '1a3eb042':
  Replace av_dlog with normal av_log at trace level

Conflicts:
	ffplay.c
	libavdevice/fbdev_dec.c
	libavfilter/avfilter.c
	libavfilter/internal.h
	libavfilter/setpts.c
	libavfilter/src_movie.c
	libavfilter/vf_crop.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fieldorder.c
	libavformat/assdec.c
	libavformat/avidec.c
	libavformat/flvdec.c
	libavformat/http.c
	libavformat/ipmovie.c
	libavformat/isom.c
	libavformat/mov.c
	libavformat/mpegenc.c
	libavformat/mpegts.c
	libavformat/mpegtsenc.c
	libavformat/mux.c
	libavformat/mxfdec.c
	libavformat/nsvdec.c
	libavformat/oggdec.c
	libavformat/r3d.c
	libavformat/rtspdec.c
	libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

40d552da

Merge commit '' · 8e8219e0

Michael Niedermayer authored Apr 20, 2015

* commit 'c253340a':
  log: Introduce a more verbose debug level

Conflicts:
	doc/APIchanges
	doc/fftools-common-opts.texi
	libavutil/log.c
	libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

8e8219e0

19 Apr, 2015 14 commits
- ffmpeg: Fix null pointer dereference in do_video_out() · 93db2708
  Michael Niedermayer authored Apr 19, 2015
```
Fixes: CID1295087
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  93db2708
- hqx: Implement slice-threaded decoding · 5b5338f6
  Vittorio Giovara authored Apr 09, 2015
```
Inspired by a patch from Ferdinand Oeinck <ferdo@demon.nl>.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
```
  5b5338f6
- hqx: Store shareable data in main decoder context · 453642f8
  Vittorio Giovara authored Apr 09, 2015
```
In preparation for multithreaded decoding.
```
  453642f8
- avformat/matroskadec: remove now duplicate doctype check · 0cab0931
  Michael Niedermayer authored Apr 19, 2015
```
See: b8d7f318
See: d9fe6b92Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  0cab0931
- avcodec/mpeg4videodec: Use check_marker() · 9a0f60a0
  Michael Niedermayer authored Apr 19, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  9a0f60a0
- avformat/http: Fix 2 typos · 22c0585a
  Michael Niedermayer authored Apr 19, 2015
```
Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  22c0585a
- hqx: Move DSP related code to a separate file · ea031b75
  Vittorio Giovara authored Apr 09, 2015
  
  ea031b75
- hqx: Merge invalid format check within switch block · 17aa81d9
  Vittorio Giovara authored Apr 09, 2015
  
  17aa81d9
- lavc: Replace av_dlog and tprintf with internal macros · 6a85dfc8
  Vittorio Giovara authored Mar 16, 2015
  
  6a85dfc8
- Replace av_dlog with normal av_log at trace level · 1a3eb042
  Vittorio Giovara authored Mar 16, 2015
```
This applies to every library where performance is not critical.
```
  1a3eb042
- log: Introduce a more verbose debug level · c253340a
  Vittorio Giovara authored Mar 16, 2015
```
And deprecate av_dlog macro.
```
  c253340a
- avformat/http: Return an error in case of prematurely ending data · 3668701f
  Michael Niedermayer authored Mar 28, 2015
```
Fixes Ticket 4039
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  3668701f
- avutil: remove pointless bmi1 define · a40cee03
  James Almer authored Apr 18, 2015
```
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
```
  a40cee03
- cmdutils: indent protocols listing · d1a89220
  Lou Logan authored Apr 18, 2015
```
For readability.
Signed-off-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  d1a89220
18 Apr, 2015 3 commits

alsdec: validate time diff index · faf9fe2c

Andreas Cadhalpun authored Apr 18, 2015

If begin is smaller than t, the subtraction 'begin -= t' wraps around,
because begin is unsigned. The same applies for end < t.

This causes segmentation faults.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

faf9fe2c

wavpackenc: use put_sbits() · 5cd21693

James Almer authored Apr 18, 2015

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

5cd21693

matroskadec: fix crash when parsing invalid mkv · b8d7f318
Thomas Guillem authored Apr 10, 2015
```
CC: libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>
```
b8d7f318

17 Apr, 2015 2 commits
- avformat/riff: support G729A · df7c2b2f
  Paul B Mahol authored Apr 17, 2015
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
  df7c2b2f
- avcodec/g729dec: support decoding packets with multiple frames · daf73d5d
  Paul B Mahol authored Apr 17, 2015
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
  daf73d5d
18 Apr, 2015 12 commits

Merge commit '' · f98cad87

Michael Niedermayer authored Apr 18, 2015

* commit 'b8d7f318':
  matroskadec: fix crash when parsing invalid mkv
Merged-by: Michael Niedermayer <michaelni@gmx.at>

f98cad87

alsdec: limit avctx->bits_per_raw_sample to 32 · 4c2b8867

Andreas Cadhalpun authored Apr 18, 2015

avctx->bits_per_raw_sample is used in get_sbits_long, which only
supports up to 32 bits.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

4c2b8867

avcodec/alsdec: Use av_mallocz_array() for chan_data to ensure the arrays never contain random data · 7e104647
Michael Niedermayer authored Apr 18, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
7e104647

alsdec: ensure channel reordering is reversible · ef16501a

Andreas Cadhalpun authored Apr 18, 2015

If the same idx is used for more than one i, at least one entry in
sconf->chan_pos remains uninitialized.

This can cause segmentation faults.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ef16501a

proresenc_anatoliy: use put_sbits() · d8c52f5d

James Almer authored Apr 18, 2015

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

d8c52f5d

adpcm: use av_clip_intp2() · 778bac27

James Almer authored Apr 18, 2015

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

778bac27

dca_xll: use av_clip_intp2() · 979b77ee

James Almer authored Apr 18, 2015

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

979b77ee

dcaenc: use put_sbits() · b5564e04

James Almer authored Apr 18, 2015

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

b5564e04

aaccoder: use put_sbits() · 6863249b

James Almer authored Apr 18, 2015

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

6863249b

lavf: add documentation on directory listing API · e623e8cb
Mariusz Szczepańczyk authored Apr 18, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
e623e8cb
avcodec/cabac: remove START/STOP_TIMER debug/benchmark code · e739cbb2
Michael Niedermayer authored Apr 18, 2015
```
Found-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
e739cbb2
avformat/utils: Add HEVC to unreliable_tb() · edbb9b5e
Michael Niedermayer authored Apr 17, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
edbb9b5e