Commits · d8cab5c26b0987f139830937e1f30b2a10822680 · Linshizhi / ffmpeg.wasm-core

06 Nov, 2011 10 commits

Merge remote-tracking branch 'qatar/master' · d8cab5c2

Michael Niedermayer authored Nov 06, 2011

* qatar/master:
  http: Remove the custom function for disabling chunked posts
  rtsp: Disable chunked http post through AVOptions
  movdec: Set frame_size for AMR
  h264_weight: remove duplication functions.
  swscale: align vertical filtersize by 2 on x86.
  libavfilter: reindent.
  matroskadec: empty blocks are in fact valid.
  avfilter: don't abort() on zero-size allocations.
  h264: improve calculation of codec delay.
  movenc: Set a correct packet size for AMR-NB mode 15, "no data"
  avformat: Add functions for doing global network initialization
  avformat: Add the https protocol
  avformat: Add the tls protocol, using OpenSSL or gnutls
  avformat: Initialize gnutls in ff_tls_init()
  w32threads: Wrap the mutex functions in inline functions returning int
  configure: Allow linking to the gnutls library
  avformat: Add ff_tls_init()/deinit() that initialize OpenSSL
  configure: Allow linking to openssl
  avcodec: Allow locking and unlocking an avformat specific mutex
  avformat: Split out functions from network.h to a new file, network.c

Conflicts:
	Changelog
	configure
	doc/APIchanges
	libavcodec/internal.h
	libavcodec/version.h
	libavfilter/formats.c
	libavformat/matroskadec.c
	libavformat/mov.c
	libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

d8cab5c2

wtvdec: ignore another known guid · 3b4798a8
Peter Ross authored Nov 06, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
3b4798a8

Set avctx->coded_width/height to uncropped h264 sizes · 29a29226

Joakim Plate authored Nov 05, 2011

avctx->width/height remain right/bottom cropped as previous behaviour.

Hardware decoders need to know the uncropped data to allocate surfaces
of correct height. Some hardware is picky and fails to decoder properly
if a surface larger than needed is used during decode, so just aligning
up is not enough.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

29a29226

audioconvert: use + in av_get_channel_layout_string. · 1125571b

Nicolas George authored Nov 05, 2011

When constructing a channel layout string from individual channel names,
+ is a more practical separator than |, because it is usually not a shell
special character.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

1125571b

dshow: don't print min/max values for fps the wrong way around · 526a7d85
Ramiro Polla authored Sep 30, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
526a7d85
dshow: save opened device reference so it may be properly closed · e3e96283
Ramiro Polla authored Sep 30, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
e3e96283
dshow: release filter reference obtained from enumeration · 21a928d0
Ramiro Polla authored Sep 30, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
21a928d0
dshow: indent · 5b186148
Ramiro Polla authored Sep 30, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
5b186148
dshow: support choosing between devices with same name · 2f9b9559
Ramiro Polla authored Sep 30, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
2f9b9559
src_movie: set the channel layout to default if the codec did not set it. · 68b531fe
Nicolas George authored Nov 05, 2011
```
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
68b531fe

05 Nov, 2011 30 commits
- matroskaenc: base default duration on avg_frame_rate if possible. · ea83b032
  Michael Niedermayer authored Nov 05, 2011
```
Fixed Ticket432
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  ea83b032
- ffmpeg: preserve avg_frame_rate on stream copy. · 0e559023
  Michael Niedermayer authored Nov 05, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  0e559023
- libvpxenc: Fix "Additional information: g_lag_in_frames out of range [..25]" · 439e1d19
  Michael Niedermayer authored Nov 05, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  439e1d19
- Mark AVFilterPad[] compound literals as const. · 5af7daab
  Reimar Döffinger authored Nov 05, 2011
```
GCC 4.6.2 at least still seems to fail to put them in .rodata though,
see also http://gcc.gnu.org/bugzilla/show_bug.cgi?id=37303Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
```
  5af7daab
- Set AVFrame reference before reget_buffer. · d9010daa
  Reimar Döffinger authored Nov 05, 2011
```
Otherwise it might return a write-only frame which would break
decoding completely.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
```
  d9010daa
- nuv: do not use data not initialized by LZO decompression. · 266f6eef
  Reimar Döffinger authored Nov 05, 2011
```
This fixes visible corruption in the incomplete last frame
of the FATE sample.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
```
  266f6eef
- nuv: Fix combination of size changes and LZO compression. · 95e1dfee
  Reimar Döffinger authored Nov 05, 2011
```
There were multiple issues, for example might we have to re-run
the decompression when the size of the buffer increased,
we should always use a decompression buffer large enough for
the header (so we do not get stuck when the size is too small).
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
```
  95e1dfee
- Check NUV per-frame header for validity. · 6f3ebcc3
  Reimar Döffinger authored Nov 05, 2011
```
Since it contains dimensions parsing an invalid one has rather
annoying effects.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
```
  6f3ebcc3
- rtjpeg: check get_block return value for error. · 4e6413c6
  Reimar Döffinger authored Nov 05, 2011
```
This avoids crashes due to reading out-of-bounds.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
```
  4e6413c6
- Simplify using get_bits_left. · fffa4530
  Reimar Döffinger authored Nov 05, 2011
```
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
```
  fffa4530
- av_lzo1x_decode: properly handle negative buffer length. · b9242fd1
  Reimar Döffinger authored Nov 05, 2011
```
Treating them like 0 is safest, current code would invoke
undefined pointer arithmetic behaviour in this case.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
```
  b9242fd1
- Use FFALIGN. · 7f6c828f
  Reimar Döffinger authored Nov 05, 2011
```
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
```
  7f6c828f
- Try to set AVFrame.reference to correct values. · 371e1654
  Reimar Döffinger authored Nov 05, 2011
```
I am not sure these new values are correct, not am I sure
the semantics are a good idea since we do not seem to make any
use of them but they caused a lot of confusion, but this
seems to make things closer to matching the documentation.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
```
  371e1654
- h264: fix ssse3 biweight code with weights of 128 · fb228883
  Michael Niedermayer authored Nov 05, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  fb228883
- Merge remote-tracking branch 'cus/stable' · 971701d4
  Michael Niedermayer authored Nov 05, 2011
```
* cus/stable:
  ffplay: Avoid useage of deprecated url_fileno().
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  971701d4
- wtvenc: use ff_put_guid and remove local copy of this function · 42b5a6f6
  Peter Ross authored Nov 05, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  42b5a6f6
- asfenc: rename put_guid to ff_put_guid · b7c9512f
  Peter Ross authored Nov 05, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  b7c9512f
- wtvenc: add @file comment · 1efe4ff9
  Peter Ross authored Nov 05, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  1efe4ff9
- fix whitespace nits · 3852c29f
  Peter Ross authored Nov 05, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  3852c29f
- http: Remove the custom function for disabling chunked posts · 18ae3626
  Martin Storsjö authored Jun 20, 2010
```
Signed-off-by: Martin Storsjö <martin@martin.st>
```
  18ae3626
- rtsp: Disable chunked http post through AVOptions · d450cc4f
  Martin Storsjö authored Jun 20, 2010
```
This avoids having to use a private function.
Signed-off-by: Martin Storsjö <martin@martin.st>
```
  d450cc4f
- Make ff_mba_* arrays const. · 49baf44c
  Reimar Döffinger authored Nov 05, 2011
```
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
```
  49baf44c
- Make another static array const. · b052601b
  Reimar Döffinger authored Nov 05, 2011
```
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
```
  b052601b
- Make fdct_r_row_sse2 const. · db076a2c
  Reimar Döffinger authored Nov 05, 2011
```
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
```
  db076a2c
- Make AMR tables of lookup filter tables const. · b883c879
  Reimar Döffinger authored Nov 05, 2011
```
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
```
  b883c879
- Make another PixelFormat list const. · 6f6ab1d9
  Reimar Döffinger authored Nov 05, 2011
```
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
```
  6f6ab1d9
- Make sdl_overlay_pix_fmt_map static const. · 91e7e6b7
  Reimar Döffinger authored Nov 05, 2011
```
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
```
  91e7e6b7
- Make PIX_FMT format list arrays const. · d7e95ccd
  Reimar Döffinger authored Nov 05, 2011
```
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
```
  d7e95ccd
- Make rgb_pixfmt_map const. · 85414225
  Reimar Döffinger authored Nov 05, 2011
```
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
```
  85414225
- Make tab_frw_01234567_sse2 const. · 9663b8da
  Reimar Döffinger authored Nov 05, 2011
```
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
```
  9663b8da