Commits · 95d6e5bdd58d5caaa52c57bad1e1d87df59fb7f8 · Linshizhi / ffmpeg.wasm-core

18 Nov, 2011 3 commits

Merge remote-tracking branch 'qatar/master' · 95d6e5bd

Michael Niedermayer authored Nov 18, 2011

* qatar/master:
  vp5: Fix illegal read.
  vp6: Fix illegal read.
  tls: Use TLSv1_client_method for OpenSSL
Merged-by: Michael Niedermayer <michaelni@gmx.at>

95d6e5bd

j2kdec: fix 10l typo in initializing sgnd. · 640424e0
Michael Niedermayer authored Nov 18, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
640424e0

Added support for J2K encoding with libopenjpeg · 856b33f5

Michael Bradshaw authored Nov 17, 2011

Note: Some of the previous patches have had two bugs that have been fixed
in this patch.
Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

856b33f5

17 Nov, 2011 32 commits
- vf_scale: Fix slice position assert to take vertical subsampling into account. · 32aa9590
  Michael Niedermayer authored Nov 17, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  32aa9590
- sws: handle jpeg pixel formats in sws_init_context() · 5bccb2d0
  Michael Niedermayer authored Nov 17, 2011
```
Fixes Ticket576
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  5bccb2d0
- libutvideo: use K&R style. · 34958174
  Clément Bœsch authored Nov 14, 2011
  
  34958174
- vp5: Fix illegal read. · bb4b0ad8
  Alex Converse authored Nov 17, 2011
```
Found with Address Sanitizer
```
  bb4b0ad8
- vp6: Fix illegal read. · e0966eb1
  Thierry Foucu authored Nov 17, 2011
```
Found with Address Sanitizer
Signed-off-by: Alex Converse <alex.converse@gmail.com>
```
  e0966eb1
- ac3probe: Detect Sonic Foundry Soft Encode AC3 as raw AC3. · 30ca700b
  Michael Niedermayer authored Nov 17, 2011
```
Our ac3 code chain can handle it fine.
More ideal would be to write a demuxer that actually extracts what can be from the additional
headers and uses it for whatever it can be used for.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  30ca700b
- swr: doxument matrix fields. · 4fef94c6
  Michael Niedermayer authored Nov 17, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  4fef94c6
- swr: move code to avoid resample forward declaration. · 0bfc03df
  Clément Bœsch authored Nov 17, 2011
  
  0bfc03df
- swr: introduce a public function to customize the channel mapping. · eafa2b60
  Clément Bœsch authored Nov 17, 2011
  
  eafa2b60
- doc: reword and clarify default stream selection. · d3baced2
  Tim Nicholson authored Nov 17, 2011
  
  d3baced2
- aacdec: Avoid unneeded reinit due to ADTS headers · 5a2b3f3a
  Michael Niedermayer authored Nov 17, 2011
```
Fixes Ticket 662
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  5a2b3f3a
- swr: use av_opt_set_int() instead of manual assignments in swr_alloc_set_opts(). · 1dbd433f
  Clément Bœsch authored Nov 17, 2011
  
  1dbd433f
- swr: surround mixing is obviously used, fix comment. · f03afd5d
  Clément Bœsch authored Nov 17, 2011
  
  f03afd5d
- swr: doxycomment public API. · 68d3144e
  Clément Bœsch authored Nov 17, 2011
  
  68d3144e
- swr: correctly raise rematrix AVERROR. · acd56efb
  Clément Bœsch authored Nov 17, 2011
  
  acd56efb
- libopenjpeg: rename decoder source file. · 31ec6947
  Michael Bradshaw authored Nov 17, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  31ec6947
- Do not try to read total disc or track number if data atom is too short. · d50122ea
  Carl Eugen Hoyos authored Nov 17, 2011
```
Fixes ticket #659.
```
  d50122ea
- tls: Use TLSv1_client_method for OpenSSL · 92db95e9
  Martin Storsjö authored Nov 17, 2011
```
TLSv1 is compatible with SSLv3, so this doesn't change much
in terms of compatibility. By explicitly using TLSv1, OpenSSL
sends the server name indication (SNI) header, which we
already set using SSL_set_tlsext_host_name (earlier, this
didn't have any effect).

SNI allows servers to serve SSL content for different host
names with separate certificates on one single port (vhosts).
Signed-off-by: Martin Storsjö <martin@martin.st>
```
  92db95e9
- swr: fix "control reaches end of non-void function" compiler warning. · 7cdfce4f
  Clément Bœsch authored Nov 16, 2011
  
  7cdfce4f
- swr: bump minor version. · 809631af
  Clément Bœsch authored Nov 16, 2011
  
  809631af
- swr: use int16_t instead of short for resampling. · af1eb298
  Clément Bœsch authored Nov 16, 2011
  
  af1eb298
- swr: start doxycommenting the API. · 4c0bad51
  Clément Bœsch authored Nov 16, 2011
  
  4c0bad51
- swr: make swr_* functions match the prototypes. · a768b9d8
  Clément Bœsch authored Nov 16, 2011
  
  a768b9d8
- swr: rename swr_alloc2() to swr_alloc_set_opts(). · 645c61fb
  Clément Bœsch authored Nov 16, 2011
  
  645c61fb
- swr: use "swri_" prefix instead of "swr_" for the private API. · c4deb90c
  Clément Bœsch authored Nov 16, 2011
  
  c4deb90c
- swr: drop 'AV' prefix from ResampleContext. · 64db5a1a
  Clément Bœsch authored Nov 16, 2011
```
This type/struct is not part of the public API.
```
  64db5a1a
- swr: make audio convert code explicitely private. · fc6351d0
  Clément Bœsch authored Nov 16, 2011
```
Only what's declared in libswresample/swresample.h is public.
```
  fc6351d0
- swr: fix #endif comment ref. · 3a5fc385
  Clément Bœsch authored Nov 16, 2011
  
  3a5fc385
- h264: fix cur_chroma_format_idc with slice multithreading. · 3e971fc6
  Michael Niedermayer authored Nov 17, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  3e971fc6
- mjpeg: support mpo · 1d23e524
  Michael Niedermayer authored Nov 17, 2011
```
Fixes stereoscopic_photo.mpo
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  1d23e524
- Merge remote-tracking branch 'qatar/master' · 8709ba90
  Michael Niedermayer authored Nov 17, 2011
```
* qatar/master:
  mpegaudiodec: Don't use a nonexistent log context for av_dlog
  avformat: Accept the ISO8601 separate format as input, too
  avformat: Interpret times in ff_iso8601_to_unix_time as UTC
  avutil: Add av_timegm as a public function
  cinepak: Add another special case so that it can handle the following file:
  lagarith: add some RGBA decoding support
  lagarith: Add correct line prediction for RGB

Conflicts:
	doc/APIchanges
	libavcodec/cinepak.c
	libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  8709ba90
- h264: migrate poc gap based has_b_frames calculation into new has_b_frame calculation code. · 4f7ad4c3
  Michael Niedermayer authored Nov 17, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  4f7ad4c3
16 Nov, 2011 5 commits
- h264: minor simplification · ed83f848
  Michael Niedermayer authored Nov 16, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  ed83f848
- h264: rewrite has_b_frame calculation code, · bfca3511
  Michael Niedermayer authored Nov 16, 2011
```
the previous implementation was too buggy.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  bfca3511
- h264: reset last_pocs on IDRs · 18b7f400
  Michael Niedermayer authored Nov 16, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  18b7f400
- cinepak: remove redundant coordinate checks · 7056f13a
  Michael Niedermayer authored Nov 16, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  7056f13a
- cinepak: check strip_size · cea0c82d
  Michael Niedermayer authored Nov 16, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  cea0c82d