Commits · 19b3a25048d956622ebcc26b722a0a5c5155553f · Linshizhi / ffmpeg.wasm-core

03 Mar, 2014 6 commits

lavu/log: add device categories · 19b3a250
Lukasz Marek authored Feb 22, 2014
```
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
```
19b3a250
ffmpeg: dont try to run the subtitle encoder on non subtitle streams · b79dfd16
Michael Niedermayer authored Mar 03, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
b79dfd16
avformat/httpauth: add comment about "" and algorithm · ab5d46df
Michael Niedermayer authored Mar 03, 2014
```
Suggested-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
ab5d46df

avformat/HLS: modified EXT-X-MEDIA-SEQUENCE header in order to follow the HLS standard · 65c95de2

Willy Aubry authored Feb 05, 2014

When using the wrap option the EXT-X-MEDIA-SEQUENCE header of the playlist file was reset instead of being incremented.
It is now incremented by one for every media URI removed from the playlist file as the standard states.
Signed-off-by: Willy Aubry <waubry@viotech.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

65c95de2

libutvideoenc: Add support for the new BT.709 FourCCs for YCbCr · 40feed52

Jan Ekström authored Feb 15, 2014

With cli usage the decoder might have not set the colorspace during
encoder init, manual colorspace override might be needed in such
cases.
Signed-off-by: Anton Khirnov <anton@khirnov.net>

This applies commit 5de64bb3 (the source of the above commit message)
to libutvideoenc as well.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

40feed52

avformat/utils: detect MPEG streams with faulty DTS and discard affected DTS · 2dcaa1b9
Michael Niedermayer authored Mar 03, 2014
```
Fixes issue2.ts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
2dcaa1b9

02 Mar, 2014 11 commits

Merge commit '' · 411f8f4c

Michael Niedermayer authored Mar 02, 2014

* commit '5c9c305d':
  ass: K&R formatting cosmetics

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

411f8f4c

avcodec/hevcpred_template: also initialize top[-1] for constrained intra prediction · dfefc909

Michael Niedermayer authored Mar 02, 2014

Fixes out of array read
Fixes: 387713a12dc5cfa27fcb4178084ce1ea-asan_stack-oob_131176a_1182_cov_3861068719_CAINIT_C_SHARP_3.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

dfefc909

avcodec/g2meet: also reset local got_header when reseting the context got_header · 8b8ae298
Michael Niedermayer authored Mar 02, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
8b8ae298

avcodec/g2meet: fix error returns · 6b53c1aa

Michael Niedermayer authored Mar 02, 2014

Fixes out of array accesses

This should not affect any release

Fixes: 8ab69af9e5a7a7e20fe04cdd25c0d6e7-asan_heap-oob_e72b82_5505_cov_2278389485_g2m4.wmv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

6b53c1aa

ass: K&R formatting cosmetics · 5c9c305d
Patrice Clement authored Feb 28, 2014

5c9c305d

Revert "mpegts: do not set pts for missing dts in video streams" · 0bf88286

Michael Niedermayer authored Mar 02, 2014

This reverts commit f65afef1.

If only pts is coded then dts must be equal pts
See Rec. ITU-T H.222.0 (06/2012) / ISO/IEC 13818-1:2013 (E) 2.7.5

Found-by: Baptiste Coudurier

0bf88286

x86/synth_filter: Revert the switch to float ops with SSE2 · 884e085d

James Almer authored Mar 02, 2014

This reverts the changes 64672098
and 68c3ed93 did to the SSE2 version,
which generated a hit of about 5 cycles.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

884e085d

avformat/oggparsevorbis: check packet size before reading new_len from it · f5d1d1e4

Michael Niedermayer authored Mar 02, 2014

Fixes out of array read
Fixes: 34260c7981118fb38fba61809bf4dd5a-asan_heap-oob_93b923_1508_cov_951051643_DivX640x480_oggvorbis.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

f5d1d1e4

avformat/avidec: Use a buffer with sufficient padding in read_gab2_sub() · 52a21386

Michael Niedermayer authored Mar 02, 2014

Fixes out of array read
Fixes: 0ff9841c2a102f06e0d582bfc3376cbd-asan_heap-oob_495589_6836_cov_1763916974_mewmew_ssa.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

52a21386

Merge remote-tracking branch 'qatar/master' · 73f930ee

Michael Niedermayer authored Mar 02, 2014

* qatar/master:
  ituh263: reject b-frame with pp_time = 0

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

73f930ee

x86/synth_filter: add synth_filter_avx · 68c3ed93

James Almer authored Mar 01, 2014

Sandy Bridge Win64:
180 cycles on ff_synth_filter_inner_sse2
150 cycles on ff_synth_filter_inner_avx
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

68c3ed93

01 Mar, 2014 23 commits

avformat/mp3dec: optimize mp3_seek() for dir < 0 · 171dd675

Michael Niedermayer authored Mar 01, 2014

this minimizes the amount of protocol seeks and reading needed in that case
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

171dd675

avformat/aviobuf: optimize sequential backward seeking · 9600486d
Michael Niedermayer authored Mar 01, 2014
```
This reduces the number of protocol seeks
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
9600486d
avformat/aviobuf: factorize buffer_size out · 2adf422c
Michael Niedermayer authored Mar 01, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
2adf422c

ituh263: reject b-frame with pp_time = 0 · 95144403

Keiji Costantini authored Mar 01, 2014

Avoid a division by 0 in ff_mpeg4_set_one_direct_mv.

Sample-Id: 00000168-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

95144403

RELEASE: update for 2.2 · 7e268a8a
Michael Niedermayer authored Mar 01, 2014
```
Found-by: Timothy
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
7e268a8a

x86/synth_filter: add synth_filter_sse · 64672098

James Almer authored Mar 01, 2014

Build only on x86_32 targets.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

64672098

HLS: Handle the case when hls_list_size=0. Playlist file should contain all... · 561bfce2

Senthilnathan M authored Mar 01, 2014

HLS: Handle the case when hls_list_size=0. Playlist file should contain all the segments. Fixes bug #3376.
Signed-off-by: Senthilnathan M <senthil.codr@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

561bfce2

Merge remote-tracking branch 'qatar/master' · 5972bcfa

Michael Niedermayer authored Mar 01, 2014

* qatar/master:
  qt-faststart: Add a note about the -movflags +faststart feature

Conflicts:
	tools/qt-faststart.c

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

5972bcfa

Merge commit '' · 06fe29c4

Michael Niedermayer authored Mar 01, 2014

* commit 'ea7f79f9':
  qt-faststart: Avoid unintentionally sign extending BE_32

See: 582f36ca
See: 69ce34c7Merged-by: Michael Niedermayer <michaelni@gmx.at>

06fe29c4

Merge commit '' · 7fa3ec88

Michael Niedermayer authored Mar 01, 2014

* commit 'bb95334c':
  qt-faststart: Check offset_count before reading from the moov_atom buffer

Conflicts:
	tools/qt-faststart.c

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

7fa3ec88

Merge commit '' · 77c23520

Michael Niedermayer authored Mar 01, 2014

* commit '63848854':
  qt-faststart: Check the ftello() return codes

Conflicts:
	tools/qt-faststart.c

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

77c23520

Merge commit '' · 817f8138

Michael Niedermayer authored Mar 01, 2014

* commit '03c2a66f':
  qt-faststart: Fix the signedness of variables keeping the ftello return values

Conflicts:
	tools/qt-faststart.c

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

817f8138

Merge commit '' · 11c4bc9a

Michael Niedermayer authored Mar 01, 2014

* commit '56122443':
  qt-faststart: Check fseeko() return codes

Conflicts:
	tools/qt-faststart.c

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

11c4bc9a

Merge commit '' · 0bb474f6

Michael Niedermayer authored Mar 01, 2014

* commit 'ea15a9a5':
  qt-faststart: Simplify code by using a MIN() macro

Conflicts:
	tools/qt-faststart.c

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

0bb474f6

Merge commit '' · eea2cd23

Michael Niedermayer authored Mar 01, 2014

* commit '3cbc7ef3':
  qt-faststart: Increase the copy buffer size to 64 KB

Conflicts:
	tools/qt-faststart.c

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

eea2cd23

Merge commit '' · a22907e9

Michael Niedermayer authored Mar 01, 2014

* commit 'd1f9563d':
  pthread_frame: flush all threads on flush, not just the first one
Merged-by: Michael Niedermayer <michaelni@gmx.at>

a22907e9

Merge commit '' · f0ce3854

Michael Niedermayer authored Mar 01, 2014

* commit 'bc6461c2':
  af_compand: replace strtok_r() with av_get_token()

Conflicts:
	configure
	libavfilter/af_compand.c

Not merged as requested by ubitux
Merged-by: Michael Niedermayer <michaelni@gmx.at>

f0ce3854

Merge commit '' · cd88d894

Michael Niedermayer authored Mar 01, 2014

* commit 'fb3b2f5d':
  configure: Set the thread type after resolving dependencies

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

cd88d894

Merge commit '' · 80793afb

Michael Niedermayer authored Mar 01, 2014

* commit '2f02bbcc':
  build: Let the ffvhuff decoder/encoder depend on the huffyuv decoder/encoder

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

80793afb

Merge commit '' · 11146a9b

Michael Niedermayer authored Mar 01, 2014

* commit '34150be5':
  build: Let the iac decoder depend on the imc decoder

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

11146a9b

Merge commit '' · ad48c937

Michael Niedermayer authored Mar 01, 2014

* commit '8e0cf39f':
  build: Let all MJPEG-related decoders depend on the MJPEG decoder

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

ad48c937

Merge commit '' · c4c2b2ea

Michael Niedermayer authored Mar 01, 2014

* commit '0a36988e':
  build: Let AMV decoder depend on the SP5X decoder

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

c4c2b2ea

Merge commit '' · 5aab33de

Michael Niedermayer authored Mar 01, 2014

* commit 'f4bd9fe3':
  h264: fix clang warning about uninitialized variable
Merged-by: Michael Niedermayer <michaelni@gmx.at>

5aab33de