Commits · 17e4b0644b5ad13733bd863b14ab11ffa955009c · Linshizhi / ffmpeg.wasm-core

18 Oct, 2012 1 commit

Michael Niedermayer authored Oct 18, 2012

* commit '292d1e78':
  fate: dependencies for acodec tests
  fate: dependencies for vsynth tests
  fate: add macros useful for conditionally enabling things
  libmp3lame: resize the output buffer if needed

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

17e4b064

17 Oct, 2012 38 commits

cache: check lseek() return · eb19d89d
Michael Niedermayer authored Oct 17, 2012
```
Fixes CID717496
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
eb19d89d
cmdutils: add missing check for ftell() return · ce739e66
Michael Niedermayer authored Oct 17, 2012
```
Fixed CID703706
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
ce739e66
fate: dependencies for acodec tests · 292d1e78
Mans Rullgard authored Oct 16, 2012
```
Signed-off-by: Mans Rullgard <mans@mansr.com>
```
292d1e78

fate: dependencies for vsynth tests · b262e455

Mans Rullgard authored Oct 16, 2012

This makes the vsynth tests run only if the required codecs and
formats are enabled.
Signed-off-by: Mans Rullgard <mans@mansr.com>

b262e455

fate: add macros useful for conditionally enabling things · 21fed588
Mans Rullgard authored Oct 16, 2012
```
Signed-off-by: Mans Rullgard <mans@mansr.com>
```
21fed588

configure: do not quote arguments passed to filter{,_out} in check_ld. · 916352f2

Alexis Ballier authored Oct 17, 2012

This fixes the following error:
./configure: eval: line 417: syntax error near unexpected token `-lcdio_cdda'
[...]
Broken by 66a1ccd7 when doing, e.g., ./configure --enable-gpl --enable-libcdio.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

916352f2

cmdutils: remove unneeded null check · 35daf3ca
Michael Niedermayer authored Oct 17, 2012
```
Fixes CID703769
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
35daf3ca
examples/muxing: merge add_audio_stream() and add_video_stream() · eebde404
Stefano Sabatini authored Aug 03, 2012
```
Factorize.
```
eebde404
examples/muxing: check on frame · eda0a52b
Stefano Sabatini authored Oct 17, 2012
```
Fix crash in case frame is not defined (e.g. with muxing out.wav).
```
eda0a52b
examples/muxing: fix bogus setting of st->id · d6196d94
Stefano Sabatini authored Oct 17, 2012

d6196d94
examples/muxing: remove misleading comment about pending API change · 5ca298df
Stefano Sabatini authored Oct 17, 2012
```
The API was never changed since 2003. Replace with a comment about the
performed operation.
```
5ca298df
examples/muxing: remove video_outbuf unused and useless code · 1f796262
Stefano Sabatini authored Oct 17, 2012

1f796262

lavfi/avf_concat: fix invalid exclusive test. · 709628aa

Nicolas George authored Oct 17, 2012

The invalid test did not cause any actual problem since
the first branch is only possible with bogus filters.

Fix coverity issue CID 733850.

709628aa

tiff: run strlen() after setting the pointer · d185c8a7
Michael Niedermayer authored Oct 17, 2012
```
Fixes CID733803
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
d185c8a7
ffmdec: check av_new_packet() return value · f03c0f6a
Michael Niedermayer authored Oct 17, 2012
```
Fixes CID733711
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
f03c0f6a
ffmdec: fix hypothetical overflows · a0e0e1e1
Michael Niedermayer authored Oct 17, 2012
```
Fixes CID703739
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
a0e0e1e1
ffm_read_write_index: check lseek return code · 71bc8c95
Michael Niedermayer authored Oct 17, 2012
```
Fixes CID732184
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
71bc8c95
ffm_write_write_index: check lseek() return code · 378a5b9c
Michael Niedermayer authored Oct 17, 2012
```
Fixes CID732185
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
378a5b9c
ffm_seek: fix division by zero · 7fd65104
Michael Niedermayer authored Oct 17, 2012
```
Fixes CID732202
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
7fd65104
libavfilter/lavfutils: remove useless NULL check on format context · 657998b5
Michael Niedermayer authored Oct 17, 2012
```
Fixes: CID733804
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
657998b5
libavfilter/lavfutils: remove useless NULL check on codec context · fd9e88fe
Michael Niedermayer authored Oct 17, 2012
```
The code would crash before if it was NULL

Fixes CID733804
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
fd9e88fe
mov_probe: fix integer overflows · a4fe6611
Michael Niedermayer authored Oct 17, 2012
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
a4fe6611
idcinvideo: remove redundant " id CIN Video: " from av_log() · 9b762e2c
Paul B Mahol authored Oct 17, 2012
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
9b762e2c

libmp3lame: resize the output buffer if needed · abd8b9e7

Justin Ruggles authored Oct 16, 2012

The LAME API documentation for the required buffer size refers to the size for
a single encode call. However, we store multiple frames in the same output
buffer but only read 1 frame at a time out of it. As a result, the buffer size
given in lame_encode_buffer() is actually smaller than what it should be.
Since we do not know how many frames it will end up buffering, it is best to
just reallocate if needed.

abd8b9e7

Merge remote-tracking branch 'qatar/master' · 775d41b6

Michael Niedermayer authored Oct 17, 2012

* qatar/master:
  configure: Add support for Tilera processors
  wavdec: check size before reading the data, not after.

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

775d41b6

Merge commit '' · 940ee636

Michael Niedermayer authored Oct 17, 2012

* commit '79922d72':
  wav: do not fail on empty INFO tags

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

940ee636

Merge commit '' · df5e089d

Michael Niedermayer authored Oct 17, 2012

* commit '31c54711':
  lavf: split wav muxer and demuxer into separate files.

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

df5e089d

Merge commit '' · d8cfa983

Michael Niedermayer authored Oct 17, 2012

* commit '58b619c8':
  wav muxer: write metadata

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

d8cfa983

Merge commit '' · c079da50

Michael Niedermayer authored Oct 17, 2012

* commit '0bca0283':
  riff: do not write empty INFO tags

Conflicts:
	tests/ref/fate/vsynth1-cljr
	tests/ref/fate/vsynth1-ffvhuff
	tests/ref/fate/vsynth1-h261
	tests/ref/fate/vsynth1-h263
	tests/ref/fate/vsynth1-h263-obmc
	tests/ref/fate/vsynth1-h263p
	tests/ref/fate/vsynth1-huffyuv
	tests/ref/fate/vsynth1-jpegls
	tests/ref/fate/vsynth1-mjpeg
	tests/ref/fate/vsynth1-mpeg4-adap
	tests/ref/fate/vsynth1-mpeg4-adv
	tests/ref/fate/vsynth1-mpeg4-error
	tests/ref/fate/vsynth1-mpeg4-nr
	tests/ref/fate/vsynth1-mpeg4-qpel
	tests/ref/fate/vsynth1-mpeg4-qprd
	tests/ref/fate/vsynth1-mpeg4-rc
	tests/ref/fate/vsynth1-mpeg4-thread
	tests/ref/fate/vsynth1-msmpeg4
	tests/ref/fate/vsynth1-msmpeg4v2
	tests/ref/fate/vsynth1-rgb
	tests/ref/fate/vsynth1-wmv1
	tests/ref/fate/vsynth1-wmv2
	tests/ref/fate/vsynth1-yuv
	tests/ref/fate/vsynth2-cljr
	tests/ref/fate/vsynth2-ffvhuff
	tests/ref/fate/vsynth2-h261
	tests/ref/fate/vsynth2-h263
	tests/ref/fate/vsynth2-h263-obmc
	tests/ref/fate/vsynth2-h263p
	tests/ref/fate/vsynth2-huffyuv
	tests/ref/fate/vsynth2-jpegls
	tests/ref/fate/vsynth2-mjpeg
	tests/ref/fate/vsynth2-mpeg4-adap
	tests/ref/fate/vsynth2-mpeg4-error
	tests/ref/fate/vsynth2-mpeg4-nr
	tests/ref/fate/vsynth2-mpeg4-qpel
	tests/ref/fate/vsynth2-mpeg4-qprd
	tests/ref/fate/vsynth2-mpeg4-rc
	tests/ref/fate/vsynth2-mpeg4-thread
	tests/ref/fate/vsynth2-msmpeg4
	tests/ref/fate/vsynth2-msmpeg4v2
	tests/ref/fate/vsynth2-rgb
	tests/ref/fate/vsynth2-wmv1
	tests/ref/fate/vsynth2-wmv2
	tests/ref/fate/vsynth2-yuv
	tests/ref/lavf/avi
	tests/ref/seek/h261_avi
	tests/ref/seek/h263_avi
	tests/ref/seek/h263p_avi
	tests/ref/seek/lavf_avi
	tests/ref/seek/mjpeg_avi
	tests/ref/seek/mpeg4_adap_avi
	tests/ref/seek/mpeg4_error_avi
	tests/ref/seek/mpeg4_nr_avi
	tests/ref/seek/mpeg4_qpel_avi
	tests/ref/seek/mpeg4_qprd_avi
	tests/ref/seek/mpeg4_rc_avi
	tests/ref/seek/mpeg4_thread_avi
	tests/ref/seek/msmpeg4_avi
	tests/ref/seek/msmpeg4v2_avi
	tests/ref/seek/wmv1_avi
	tests/ref/seek/wmv2_avi
Merged-by: Michael Niedermayer <michaelni@gmx.at>

c079da50

Merge commit '' · fadfbb35

Michael Niedermayer authored Oct 17, 2012

* commit '71e92414':
  lavf: move RIFF INFO tag writing from avienc to riff
  avconv: fix disabling auto mappings with -map_metadata

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

fadfbb35

Merge commit '' · d6e87190

Michael Niedermayer authored Oct 17, 2012

* commit 'a25d912d':
  avcodec_encode_audio(): fix invalid free
  pcm-mpeg: correct bitrate calculation
  ffv1: K&R formatting cosmetics
  fate: Add rangecoder test
  network: #include stdint.h in network.h
  nut: export codec_tag provided by rawvideo
  avserver: move avserver-specific code from ffmdec.c to avserver.c

Conflicts:
	ffserver.c
	libavcodec/ffv1.c
	libavformat/ffmdec.c
	libavformat/nutenc.c
	tests/ref/lavfi/crop
	tests/ref/lavfi/crop_scale
	tests/ref/lavfi/crop_scale_vflip
	tests/ref/lavfi/crop_vflip
	tests/ref/lavfi/null
	tests/ref/lavfi/pixdesc
	tests/ref/lavfi/pixfmts_copy
	tests/ref/lavfi/pixfmts_crop
	tests/ref/lavfi/pixfmts_hflip
	tests/ref/lavfi/pixfmts_null
	tests/ref/lavfi/pixfmts_pad
	tests/ref/lavfi/pixfmts_scale
	tests/ref/lavfi/pixfmts_vflip
	tests/ref/lavfi/scale200
	tests/ref/lavfi/scale500
	tests/ref/lavfi/vflip
	tests/ref/lavfi/vflip_crop
	tests/ref/lavfi/vflip_vflip
Merged-by: Michael Niedermayer <michaelni@gmx.at>

d6e87190

lavc/tta: use meaningful error codes · 1ade37ae
Paul B Mahol authored Oct 17, 2012
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
1ade37ae
tta: datalen is unsigned integer per reference library · d6ea59b8
Paul B Mahol authored Oct 17, 2012
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
d6ea59b8
sws-test: parse command line args before initing contexts · 364c60bf
Michael Niedermayer authored Oct 16, 2012
```
This fixes parsing comand line args after ref
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
364c60bf
lavf/swfdec: support DefineBitsLossless{,2} tag. · 711ffb84
Clément Bœsch authored Oct 12, 2012

711ffb84
ffv1: fix packed rgb with 1.3 · 4e2e3d94
Michael Niedermayer authored Oct 17, 2012
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
4e2e3d94

mov: fix time types related to mov_metadata_creation_time · adbb75db

Michael Niedermayer authored Oct 17, 2012

Fixes Ticket1817
Based on patch by: Przemyslaw Wesolek <przemyslaw.wesolek@go.art.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

adbb75db

examples/muxing: fix video pts · 7b8fd298

Michael Niedermayer authored Oct 17, 2012

Fixes Ticket1801
Based on suggestion from AztecC
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

7b8fd298

16 Oct, 2012 1 commit
- configure: Add support for Tilera processors · c75848cd
  Derek Buitenhuis authored Oct 16, 2012
```
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
```
  c75848cd