Commits · 0c7733904e54472fa5bea04b4a7c35ff6fea9890 · Linshizhi / ffmpeg.wasm-core

15 Dec, 2014 6 commits

Michael Niedermayer authored Dec 15, 2014

* commit 'bcbdeb31':
  asvenc: Forward the error instead of asserting on it

Conflicts:
	libavcodec/asvenc.c

Not merged, conditions which are impossible should be checked by assert*()
adding impossible to be true error checks has the potential to confuse
Merged-by: Michael Niedermayer <michaelni@gmx.at>

0c773390

lavu/frame: fix malloc error path in av_frame_copy_props() · a400edbb

wm4 authored Dec 15, 2014

The error path frees all side data, but forgets to reset the side data
count. This can blow up later in av_frame_unref() and free_side_data().
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

a400edbb

configure: Set the default for --shlibdir to --libdir. · 4fa42e04
Carl Eugen Hoyos authored Dec 15, 2014
```
Fixes ticket #4183.

Reviewed-by: Ivan Kalvachev
```
4fa42e04

vp9/x86: sse2 MC assembly. · cae893f6

Ronald S. Bultje authored Dec 15, 2014

Also a slight change to the ssse3 code, which prevents a theoretical
overflow in the sharp filter.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

cae893f6

lavf/mxfdec: Fix memleaks reading corrupt files. · 4373a25d
Carl Eugen Hoyos authored Dec 15, 2014
```
Fixes ticket #4173.

Reviewed-by: Tomas Härdin
```
4373a25d
lavf/mxfdec: Factorize mxf_read_close(). · 27bdfd29
Carl Eugen Hoyos authored Dec 15, 2014
```
This will allow to fix leaks in a subsequent commit.
```
27bdfd29

14 Dec, 2014 25 commits
- vp9/x86: 32bit and sse2 support for vp9 inverse transform assembly · fd77fbb3
  Ronald S. Bultje authored Dec 14, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  fd77fbb3
- avformat/dv: Use av_freep() to avoid leaving stale pointers in memory · 4efdb29c
  Michael Niedermayer authored Dec 14, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  4efdb29c
- cmdutils: use macros for device test · 00dc2859
  Lukasz Marek authored Dec 13, 2014
```
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
```
  00dc2859
- lavd/alsa-audio-common: mark default device in device list · b3311f3c
  Lukasz Marek authored Dec 13, 2014
```
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
```
  b3311f3c
- lavd/avdevice: use better option types for caps options · 279412c8
  Lukasz Marek authored Dec 13, 2014
```
Using dedicated types allows to use format/layout names,
not just raw int values.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
```
  279412c8
- Merge commit 'fd665f7f' · 82909954
  Michael Niedermayer authored Dec 14, 2014
```
* commit 'fd665f7f':
  avconv: Use the mpeg12 private option scan_offset

Conflicts:
	ffmpeg_opt.c

See: e479013aMerged-by: Michael Niedermayer <michaelni@gmx.at>
```
  82909954
- Merge commit '559fa0d4' · 27f2e211
  Michael Niedermayer authored Dec 14, 2014
```
* commit '559fa0d4':
  vdpau: add mapping for H.264 Constrained Baseline profile and fallback
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  27f2e211
- Merge commit '8502c1e9' · 3f679f73
  Michael Niedermayer authored Dec 14, 2014
```
* commit '8502c1e9':
  vdpau: add mapping for H.264 Extended profile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  3f679f73
- Merge commit '8b51bcfe' · 0b30d186
  Michael Niedermayer authored Dec 14, 2014
```
* commit '8b51bcfe':
  vdpau: revector macro to reduce line span
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  0b30d186
- Merge commit 'e10e6651' · add040ff
  Michael Niedermayer authored Dec 14, 2014
```
* commit 'e10e6651':
  thread: use "" instead of <> for including the w32pthreads wrapper

See: 32eadfe4Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  add040ff
- asvenc: Forward the error instead of asserting on it · bcbdeb31
  Luca Barbato authored Dec 10, 2014
```
Bug-Id: CID 732997
CC: libav-stable@libav.org
```
  bcbdeb31
- avformat/utils: Do not update programs streams from program-less streams in update_wrap_reference() · a29524bf
  Michael Niedermayer authored Dec 14, 2014
```
Fixes Ticket3686
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  a29524bf
- avformat/mp3dec: Name the dummy variable as what it is, to avoid confusion · 8ddfc00a
  Michael Niedermayer authored Dec 14, 2014
```
Found-by: nattyzs <nattyzs@163.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  8ddfc00a
- avconv: Use the mpeg12 private option scan_offset · fd665f7f
  Julien Ramseier authored Dec 14, 2014
```
Introduced in aed79007

Bug-Id: debian/773055
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
```
  fd665f7f
- vdpau: add mapping for H.264 Constrained Baseline profile and fallback · 559fa0d4
  Rémi Denis-Courmont authored Dec 13, 2014
```
Old VDPAU drivers do not support this newly defined profile, so falling
back to Main profile is necessary for backward binary compatibility.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
```
  559fa0d4
- vdpau: add mapping for H.264 Extended profile · 8502c1e9
  Rémi Denis-Courmont authored Dec 13, 2014
```
Signed-off-by: Anton Khirnov <anton@khirnov.net>
```
  8502c1e9
- vdpau: revector macro to reduce line span · 8b51bcfe
  Rémi Denis-Courmont authored Dec 13, 2014
```
Signed-off-by: Anton Khirnov <anton@khirnov.net>
```
  8b51bcfe
- thread: use "" instead of <> for including the w32pthreads wrapper · e10e6651
  Anton Khirnov authored Dec 01, 2014
```
Found-by: Dave Yeo <dave.r.yeo@gmail.com>
```
  e10e6651
- avformat/aviobuf: Check that avio_seek() target is non negative · ed86dbd0
  Michael Niedermayer authored Dec 14, 2014
```
Fixes out of array access
Suggested-by: Andrew Scherkus <scherkus@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  ed86dbd0
- avfilter/vf_dctdnoiz: use av_freep() to avoid leaving stale pointers in memory · 6de2f027
  Michael Niedermayer authored Dec 14, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  6de2f027
- avfilter/f_sendcmd: Use av_freep() to avoid leaving stale pointers in memory · eb055295
  Michael Niedermayer authored Dec 14, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  eb055295
- avcodec/xiph: mark returned header pointers const from avpriv_split_xiph_headers() · ad2deb02
  Michael Niedermayer authored Dec 12, 2014
```
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  ad2deb02
- avformat/nutenc: store the actual r_frame_rate in the corresponding field if available · 3b537eab
  Michael Niedermayer authored Dec 14, 2014
```
Fixes Ticket 3629 part3
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  3b537eab
- ffmpeg: forward r_frame_rate to the muxer in case of stream copy · 28a6f970
  Michael Niedermayer authored Dec 14, 2014
```
Fixes Ticket3629 part2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  28a6f970
- avformat/utils: use r_frame_rate only in the demuxer for ff_compute_frame_duration() · add46edf
  Michael Niedermayer authored Dec 14, 2014
```
This is primarly to maintain current behavior when r_frame_rate is set for muxers
and could be reverted if it has some advantage

Fixes Ticket3629 part1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  add46edf
13 Dec, 2014 9 commits
- avcodec: fix wording in AVSubtitleRect doxy · d823edee
  Clément Bœsch authored Dec 13, 2014
  
  d823edee
- swresample/soxr_resample: fix error handling · 4b6f2253
  Rob Sykes authored Dec 13, 2014
```
Fixes CID1257659
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  4b6f2253
- fix "than" typo · d5a263f4
  Michael Niedermayer authored Dec 13, 2014
```
Found-by reimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  d5a263f4
- avformat/utils: Do not estimate the container bitrate from the streams if one... · 53496aa7
  Michael Niedermayer authored Dec 13, 2014
```
avformat/utils: Do not estimate the container bitrate from the streams if one video stream lacks the bitrate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  53496aa7
- avfilter/vf_uspp: fix gray pixfmt handling · 609a73b6
  Michael Niedermayer authored Dec 13, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  609a73b6
- avfilter/vf_uspp: fix used chroma subsampling factors · 3dd5f7aa
  Michael Niedermayer authored Dec 13, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  3dd5f7aa
- avfilter/vf_uspp: fix used pix_fmt · 354fda76
  Michael Niedermayer authored Dec 13, 2014
```
Found-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  354fda76
- avcodec/dvdsubdec: Avoid strerror() due to thread saftey · 5d0cfb58
  Michael Niedermayer authored Dec 13, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  5d0cfb58
- avcodec/libxvid_rc: Avoid strerror() for thread saftey · 3ab82e92
  Michael Niedermayer authored Dec 13, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  3ab82e92