Commits · 57865a974780c4427cc5084629c75e4ac1d87a74 · Linshizhi / ffmpeg.wasm-core

20 Apr, 2015 36 commits

avformat/mpeg: put timestamp trace av_logs under FF_DEBUG_TS · 57865a97
Michael Niedermayer authored Apr 20, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
57865a97
avformat/mux: Place timestamp related trace av_logs under FF_FDEBUG_TS · d4cf3779
Michael Niedermayer authored Apr 20, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
d4cf3779
avformat/mov: remove per packet timestamp print trace, theres generic code doing this in utils.c · e48a0a6c
Michael Niedermayer authored Apr 20, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
e48a0a6c
avformat/utils: Place timestamp trace logs under FF_FDEBUG_TS · 84b95715
Michael Niedermayer authored Apr 20, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
84b95715
avformat/utils: Provide context for av_log() where one is available · d02b3e9b
Michael Niedermayer authored Apr 20, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
d02b3e9b

avformat/avidec: Do not call av_log() per byte, use ff_tlog() · 8a91ee78

Michael Niedermayer authored Apr 20, 2015

This was av_dlog() previously and should not have been changed to av_log()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

8a91ee78

avcodec/parser: Remove duplicate header inlcude · 1ca80526
Michael Niedermayer authored Apr 20, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
1ca80526

avutil/mips/generic_macros_msa: volatile doesnt need __ · 42d6d249

Michael Niedermayer authored Apr 18, 2015

Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

42d6d249

avcodec/api-flac-test: clear callers context with close_* · 2a00ef5d
Michael Niedermayer authored Apr 20, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
2a00ef5d

libavcodec: Add FLAC API test · be70c79a

Ludmila Glinskih authored Apr 20, 2015

Signed-off-by: Ludmila Glinskih <lglinskih@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

be70c79a

avcodec/flacenc: also count wasted bits in subframe_count_exact() · 09b0f227
Michael Niedermayer authored Apr 20, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
09b0f227

Merge commit '' · 1c667626

Michael Niedermayer authored Apr 20, 2015

* commit '386e2755':
  jack: Check memory allocation

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

1c667626

avfilter/buffersrc: Use correct, matching deallocation function · a6df9ce6
Michael Niedermayer authored Apr 20, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
a6df9ce6

Merge commit '' · 0c9e78ca

Michael Niedermayer authored Apr 20, 2015

* commit '617814b4':
  buffersrc: Fix resource leak on error
Merged-by: Michael Niedermayer <michaelni@gmx.at>

0c9e78ca

Merge commit '' · eb8756e4

Michael Niedermayer authored Apr 20, 2015

* commit '336d2f09':
  avplay: Free frame and graph when memory allocation fails

Conflicts:
	ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

eb8756e4

Merge commit '' · 0796a2ab

Michael Niedermayer authored Apr 20, 2015

* commit 'eb31256f':
  g2meet: Support G2M5 codec variant

Conflicts:
	libavcodec/version.h

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

0796a2ab

Merge commit '' · 57f49fa0

Michael Niedermayer authored Apr 20, 2015

* commit '88d1fb4e':
  filtfmts: Avoid null pointer dereference

Conflicts:
	libavfilter/filtfmts.c

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

57f49fa0

Merge commit '' · 94914d69

Michael Niedermayer authored Apr 20, 2015

* commit 'a1d58e3b':
  avutil: remove pointless bmi1 define

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

94914d69

Merge commit '' · a22da5e6

Michael Niedermayer authored Apr 20, 2015

* commit '09bd7ddf':
  aacdec: consistently use avctx for logging in decode_eld_specific_config

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

a22da5e6

Merge commit '' · fc83ff80

Michael Niedermayer authored Apr 20, 2015

* commit '3d71b1f8':
  mpegvideo_enc: Simplify picture allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>

fc83ff80

Merge commit '' · 924a77fb

Michael Niedermayer authored Apr 20, 2015

* commit '0251c9be':
  motion_est: Fix warning from zero_cmp() assignment

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

924a77fb

Merge commit '' · 127f7aa4

Michael Niedermayer authored Apr 20, 2015

* commit '4d593896':
  vc1_pred: Always initialize px and py in ff_vc1_pred_mv_intfr()

Conflicts:
	libavcodec/vc1_pred.c

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

127f7aa4

Merge commit '' · 4d50d53a

Michael Niedermayer authored Apr 20, 2015

* commit '9286de04':
  mov: Double-check that alias path is not an absolute path

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

4d50d53a

Merge commit '' · 82d9c4e5

Michael Niedermayer authored Apr 20, 2015

* commit '376589e5':
  mov: Read alternate absolute path in dref alis
Merged-by: Michael Niedermayer <michaelni@gmx.at>

82d9c4e5

Merge commit '' · 5a284d07

Michael Niedermayer authored Apr 20, 2015

* commit '22526c1f':
  Canopus HQ/HQA decoder

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

5a284d07

Merge commit '' · fcca7671

Michael Niedermayer authored Apr 20, 2015

* commit 'e6fb844f':
  Implement shared parsing of INFO tag in Canopus family
Merged-by: Michael Niedermayer <michaelni@gmx.at>

fcca7671

Merge commit '' · f1db9842

Michael Niedermayer authored Apr 20, 2015

* commit 'fcda30f2':
  fate: Prefix cllc tests with canopus

Conflicts:
	tests/fate/lossless-video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>

f1db9842

Merge commit '' · 1fa7d090

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 4 commits
- jack: Check memory allocation · 386e2755
  Federico Tomassetti authored Apr 19, 2015
```
Bug-Id: CID 1265785
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
```
  386e2755
- buffersrc: Fix resource leak on error · 617814b4
  Federico Tomassetti authored Feb 23, 2015
```
Bug-Id: CID 1267902
CC: libav-stable@libav.org
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
```
  617814b4
- avplay: Free frame and graph when memory allocation fails · 336d2f09
  Federico Tomassetti authored Apr 19, 2015
```
Bug-Id: CID 1291564
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
```
  336d2f09
- g2meet: Support G2M5 codec variant · eb31256f
  Eric Zimmerman authored Apr 17, 2015
```
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
```
  eb31256f