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

16 Jun, 2013 24 commits

Michael Niedermayer authored Jun 16, 2013

* commit 'df9f22d4':
  avf: move url utility functions in a separate file

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

1f87cbe8

Merge commit '' · 8097307b

Michael Niedermayer authored Jun 16, 2013

* commit '12db891d':
  avf: move ff_write_chained to mux.c

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

8097307b

Merge commit '' · bbdef618

Michael Niedermayer authored Jun 16, 2013

* commit '508998f7':
  avf: move riff tags accessors where they belong

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

bbdef618

Merge commit '' · 84f77f84

Michael Niedermayer authored Jun 16, 2013

* commit 'ec7c51c7':
  avf: move ff_http_match_no_proxy to network

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

84f77f84

Merge commit '' · 4a522eff

Michael Niedermayer authored Jun 16, 2013

* commit 'afc86853':
  avf: split off format register and lookup function

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

4a522eff

Merge commit '' · 301522f5

Michael Niedermayer authored Jun 16, 2013

* commit 'f80b60ad':
  bitstream: forward error values and drop few abort()

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

301522f5

Merge commit '' · 9265bae3

Michael Niedermayer authored Jun 16, 2013

* commit 'f776899a':
  bitstream: K&R formatting cosmetics

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

9265bae3

Merge commit '' · 9f91e7de

Michael Niedermayer authored Jun 16, 2013

* commit '9e80eda2':
  h264_mp4toannexb_bsf: return a padded buffer
Merged-by: Michael Niedermayer <michaelni@gmx.at>

9f91e7de

Merge commit '' · 0a5d22a1

Michael Niedermayer authored Jun 16, 2013

* commit '8d929afd':
  h264_mp4toannexb_bsf: factor out extradata parsing

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

0a5d22a1

Merge commit '' · 46a5003a

Michael Niedermayer authored Jun 16, 2013

* commit '5d21ca45':
  h264_mp4toannexb_bsf: K&R formatting cosmetics

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

46a5003a

lavf: show APIC for tta files too · e997afdf
Paul B Mahol authored Jun 16, 2013
```
Fixes #2676.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
e997afdf

tta: read ape tags last · 9ea7ff79

Paul B Mahol authored Jun 16, 2013

Otherwise, cover art will create video stream with index 0.
Fixes #2677.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

9ea7ff79

postprocess_template: put rsp on the clobber list to prevent gcc from using it in "q" · 78d2d1e0
Michael Niedermayer authored Jun 16, 2013
```
Fixes Ticket2675
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
78d2d1e0
avcodec/jpeg2000dec: move bpno check to a earlier place · 3b861742
Michael Niedermayer authored Jun 16, 2013
```
This prevents additional integer overflows
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
3b861742
avf: move url utility functions in a separate file · df9f22d4
Luca Barbato authored Jun 15, 2013

df9f22d4
avf: move ff_write_chained to mux.c · 12db891d
Luca Barbato authored Jun 15, 2013

12db891d
avf: move riff tags accessors where they belong · 508998f7
Luca Barbato authored Jun 15, 2013

508998f7
avf: move ff_http_match_no_proxy to network · ec7c51c7
Luca Barbato authored Jun 15, 2013
```
It is only used by network protocols.
```
ec7c51c7
avf: split off format register and lookup function · afc86853
Luca Barbato authored Jun 15, 2013

afc86853

lavu/adler32: Fix doxy group definition, take two · 3e17eec6

James Almer authored Jun 16, 2013

The description if for the function, not the group.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

3e17eec6

lavu/hash: Add support for RIPEMD · 4a0d6030

James Almer authored Jun 16, 2013

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

4a0d6030

rawdec: allocate a buffer in the appropriate size in the copy case. · 8962da9e

Hendrik Leppkes authored Jun 16, 2013

Otherwise the created buffer can be smaller than buf_size, which results
in buffer overreads if the original image has extra padding on every line.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

8962da9e

bitstream: forward error values and drop few abort() · f80b60ad
Luca Barbato authored Jun 15, 2013

f80b60ad
bitstream: K&R formatting cosmetics · f776899a
Luca Barbato authored Jun 15, 2013

f776899a

15 Jun, 2013 14 commits
- Merge branch 'crypto' of https://github.com/jamrial/FFmpeg · 359af6a7
  Michael Niedermayer authored Jun 15, 2013
```
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  359af6a7
- lavu: Add RIPEMD hashing · 99b8cd0c
  James Almer authored Jun 15, 2013
```
Includes RIPEMD-128, RIPEMD-160, RIPEMD-256 and RIPEMD-320
Signed-off-by: James Almer <jamrial@gmail.com>
```
  99b8cd0c
- lavf/md5enc: Use AV_HASH_MAX_SIZE · 1bb005ce
  James Almer authored Jun 15, 2013
```
Also increase the buffer size in write_trailer(), since 128
is not enough anymore
Signed-off-by: James Almer <jamrial@gmail.com>
```
  1bb005ce
- lavu/hash: Add support for SHA-2 512 · b6249aca
  James Almer authored Jun 02, 2013
```
Signed-off-by: James Almer <jamrial@gmail.com>
```
  b6249aca
- lavu/utils: silence warnings about incompatible pointer types · 8a79a009
  Paul B Mahol authored Jun 15, 2013
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
  8a79a009
- Document "cache" protocol · 194fde38
  Andrey Utkin authored Jun 15, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  194fde38
- h264_mp4toannexb_bsf: return a padded buffer · 9e80eda2
  Luca Barbato authored Jun 11, 2013
```
The code using the returned buffer might expect it to be
FF_INPUT_BUFFER_PADDING_SIZE padded as any other avpacket.
```
  9e80eda2
- h264_mp4toannexb_bsf: factor out extradata parsing · 8d929afd
  Luca Barbato authored Jun 11, 2013
  
  8d929afd
- avcodec/vc1dec: Check source picture availability in vc1_mc_4mv_chroma4() · 6c4516d0
  Michael Niedermayer authored Jun 15, 2013
```
Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  6c4516d0
- avutil/utils: check and warn about llrint() brokenness · 1ba196a1
  Michael Niedermayer authored Jun 07, 2013
```
Such broken llrint() exist for example on netbsd
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  1ba196a1
- h264_mp4toannexb_bsf: K&R formatting cosmetics · 5d21ca45
  Luca Barbato authored Jun 11, 2013
  
  5d21ca45
- lavu/md5: Add doxy · c4f932f4
  James Almer authored Jun 14, 2013
```
Mostly a copy&paste from other hash functions, with changes
where required.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  c4f932f4
- lavu/crc: Fix doxy group definition · 321906d3
  James Almer authored Jun 14, 2013
```
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  321906d3
- lavu/adler32: Fix doxy group definition · 79d9ed4a
  James Almer authored Jun 14, 2013
```
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  79d9ed4a
14 Jun, 2013 2 commits

avcodec/g2meet: Check monochrome cursor width · 3c4c5ca1

Michael Niedermayer authored Jun 14, 2013

Fixes out of array write

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

3c4c5ca1

avcodec/jpeg2000dec: check len before parsing header · 69e4d8e6

Michael Niedermayer authored Jun 14, 2013

Fixes out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

69e4d8e6