Commits · 2ce2462ba8575ce16363064aecfc9fe2f4396bba · Linshizhi / ffmpeg.wasm-core

12 May, 2015 6 commits

Michael Niedermayer authored May 12, 2015

* commit 'da5c6a97':
  riff: Add MultiScope II fourcc MSC2 as MJPEG

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

2ce2462b

Merge commit '' · 85bbe1db

Michael Niedermayer authored May 12, 2015

* commit '0670acc4':
  dca_parser: Extend DTS core sync word and fix existing check

Conflicts:
	libavcodec/dca_parser.c

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

85bbe1db

tools/graph2dot: use larger data types than int for array/string sizes · acf4925f
Michael Niedermayer authored May 12, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
acf4925f

avformat/internal: Fix warning about struct declaration · 59db9e69

Michael Niedermayer authored May 12, 2015

Moving ffio_open2_wrapper() to internal as it uses AVFormatContext
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

59db9e69

riff: Add MultiScope II fourcc MSC2 as MJPEG · da5c6a97
Carl Eugen Hoyos authored May 08, 2015
```
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
```
da5c6a97

dca_parser: Extend DTS core sync word and fix existing check · 0670acc4

foo86 authored Apr 29, 2015

The previous version checked for 14-bit streams and did not properly
work across buffer boundaries.

Use the 64-bit parser state to make extended sync word detection work
across buffer boundary and check the extended sync word for 16-bit LE
and BE core streams to reduce probability of alias sync detection.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

0670acc4

11 May, 2015 17 commits

avcodec/hevc: Fix order of operations in hls_decode_neighbour() · 3ecc0633
Michael Niedermayer authored May 11, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
3ecc0633
avformat/mlvdec: Use AVFormatContext->open_cb() · 62a1e003
Michael Niedermayer authored May 11, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
62a1e003
avformat/avformat: slightly more verbose documentation for open_cb() · a228f7d5
Michael Niedermayer authored May 11, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
a228f7d5
avformat/mov: Use open_cb() if set · 77ccc914
Michael Niedermayer authored May 11, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
77ccc914

avformat: add callback for opening further files · 541d75f9

Michael Niedermayer authored May 11, 2015

Previous version reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

541d75f9

id3v2: catch avio_read errors in check_tag · 0382c94f

Andreas Cadhalpun authored May 11, 2015

Since len is an unsigned int, the comparison is currently treated as
unsigned and thus ignores all errors from avio_read.

Thus cast len to int, which is unproblematic, because at that point len
is between 0 and 4.

This fixes 'Conditional jump or move depends on uninitialised value'
valgrind warnings in is_tag.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

0382c94f

avutil/avstring: Use size_t in av_strlcatf() · ae4eea8b
Michael Niedermayer authored May 11, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
ae4eea8b
avformat/mov: Pass MovContext into mov_open_dref() · 2b97cc2e
Michael Niedermayer authored May 11, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
2b97cc2e

avcodec/libx265: use x265 Multi-library Interface to query the API · 94c20de4

Gopu Govindaswamy authored May 07, 2015

ffmpeg can now use the x265 multi-library interface to make a runtime
selection between a number of libx265 libraries (perhaps 8bpp and 16bpp).

ffmpeg will link to one build of libx265 (statically or
dynamically) and this linked version of libx265 will support one
bit-depth (8 or 10 bits). At runtime, ffmpeg now has the option to request the
encoder to use a different bit depth(8 or 10). If the requested bitdepth
is zero, or if it matches the bitdepth of the system default libx265 (the
currently linked library), then this library will be used for encode.
If ffmpeg requests a different bit-depth, the linked libx265 will attempt
to dynamically bind a shared library with the requested bit-depth from the install
location (default or user-specified).

new x265 API:
const x265_api* api = x265_api_get(int bitDepth);
x265_api - holds the libx265 public API functions
bitDepth - requested API for 8bpp or 16bpp

note: Use 0 to indicate native bit depth of the linked libx265 and
x265_api_get(0) is guaranteed to return a non-null pointer
Signed-off-by: Gopu Govindaswamy <gopu@multicorewareinc.com>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

94c20de4

avformat/vorbiscomment: Use 64bit int for ff_vorbiscomment_length() · ab6dc863
Michael Niedermayer authored May 11, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
ab6dc863
avformat/matroskaenc: Check ff_vorbiscomment_length in put_flac_codecpriv() · 66f26b3e
Michael Niedermayer authored May 11, 2015
```
Its currently guaranteed to be smaller but its safer to check anyway
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
66f26b3e
avformat/oggenc: Check ff_vorbiscomment_length in ogg_write_vorbiscomment() · 0db5b2b9
Michael Niedermayer authored May 11, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
0db5b2b9
avformat/flacenc: Check length in flac_write_block_comment() · 40a7700b
Michael Niedermayer authored May 11, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
40a7700b
avformat/vorbiscomment: Check entry length in ff_vorbiscomment_write() · eca38864
Michael Niedermayer authored May 11, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
eca38864

avformat/subtitles: Use size_t for len · a633928d

Michael Niedermayer authored May 10, 2015

string length could theoretically be larger than int
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

a633928d

avformat/matroskadec: Use size_t for the variable holding a strlen() value. · 17b26308
Michael Niedermayer authored May 11, 2015
```
Should make no difference but is more correct
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
17b26308
avformat/url: Use size_t for len from strlen() · 95efc651
Michael Niedermayer authored May 11, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
95efc651

10 May, 2015 17 commits

Merge commit '' · 28b7d7a3

Michael Niedermayer authored May 10, 2015

* commit 'b8d2630c':
  dashenc: Reduce the segment duration if cutting out parts with edit lists
Merged-by: Michael Niedermayer <michaelni@gmx.at>

28b7d7a3

Merge commit '' · ae99f06e

Michael Niedermayer authored May 10, 2015

* commit 'ac1a1cb9':
  dashenc: replace attribute id with contentType for the AdaptationSet element

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

ae99f06e

dashenc: replace attribute id with contentType for the AdaptationSet element · 32a4177a

James Almer authored May 10, 2015

id should be an integer, not a string. It is also optional, so use
contentType instead which is the proper attribute for these values.

This addresses ticket #4545, fixing an MPD validation error.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

32a4177a

fate: Use more than 5 frames for testing select and idet filters · 8d916ef5

Michael Niedermayer authored May 10, 2015

Testing these filters with just 5 frames could potentially be
insufficient
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

8d916ef5

Merge commit '' · 5e19651c

Michael Niedermayer authored May 10, 2015

* commit '2fb02ecf':
  fate: Reduce the number of frames used to test video filters

Conflicts:
	tests/fate-run.sh
	tests/ref/fate/filter-crop
	tests/ref/fate/filter-crop_scale
	tests/ref/fate/filter-crop_scale_vflip
	tests/ref/fate/filter-crop_vflip
	tests/ref/fate/filter-null
	tests/ref/fate/filter-pixdesc-abgr
	tests/ref/fate/filter-pixdesc-argb
	tests/ref/fate/filter-pixdesc-bgr24
	tests/ref/fate/filter-pixdesc-bgr444be
	tests/ref/fate/filter-pixdesc-bgr444le
	tests/ref/fate/filter-pixdesc-bgr48be
	tests/ref/fate/filter-pixdesc-bgr48le
	tests/ref/fate/filter-pixdesc-bgr4_byte
	tests/ref/fate/filter-pixdesc-bgr555be
	tests/ref/fate/filter-pixdesc-bgr555le
	tests/ref/fate/filter-pixdesc-bgr565be
	tests/ref/fate/filter-pixdesc-bgr565le
	tests/ref/fate/filter-pixdesc-bgr8
	tests/ref/fate/filter-pixdesc-bgra
	tests/ref/fate/filter-pixdesc-gbrap
	tests/ref/fate/filter-pixdesc-gbrp
	tests/ref/fate/filter-pixdesc-gbrp10be
	tests/ref/fate/filter-pixdesc-gbrp10le
	tests/ref/fate/filter-pixdesc-gbrp9be
	tests/ref/fate/filter-pixdesc-gbrp9le
	tests/ref/fate/filter-pixdesc-gray
	tests/ref/fate/filter-pixdesc-gray16be
	tests/ref/fate/filter-pixdesc-gray16le
	tests/ref/fate/filter-pixdesc-monob
	tests/ref/fate/filter-pixdesc-monow
	tests/ref/fate/filter-pixdesc-nv12
	tests/ref/fate/filter-pixdesc-nv21
	tests/ref/fate/filter-pixdesc-rgb24
	tests/ref/fate/filter-pixdesc-rgb444be
	tests/ref/fate/filter-pixdesc-rgb444le
	tests/ref/fate/filter-pixdesc-rgb48be
	tests/ref/fate/filter-pixdesc-rgb48le
	tests/ref/fate/filter-pixdesc-rgb4_byte
	tests/ref/fate/filter-pixdesc-rgb555be
	tests/ref/fate/filter-pixdesc-rgb555le
	tests/ref/fate/filter-pixdesc-rgb565be
	tests/ref/fate/filter-pixdesc-rgb565le
	tests/ref/fate/filter-pixdesc-rgb8
	tests/ref/fate/filter-pixdesc-rgba
	tests/ref/fate/filter-pixdesc-uyvy422
	tests/ref/fate/filter-pixdesc-yuv410p
	tests/ref/fate/filter-pixdesc-yuv411p
	tests/ref/fate/filter-pixdesc-yuv420p
	tests/ref/fate/filter-pixdesc-yuv420p10be
	tests/ref/fate/filter-pixdesc-yuv420p10le
	tests/ref/fate/filter-pixdesc-yuv420p16be
	tests/ref/fate/filter-pixdesc-yuv420p16le
	tests/ref/fate/filter-pixdesc-yuv420p9be
	tests/ref/fate/filter-pixdesc-yuv420p9le
	tests/ref/fate/filter-pixdesc-yuv422p
	tests/ref/fate/filter-pixdesc-yuv422p10be
	tests/ref/fate/filter-pixdesc-yuv422p10le
	tests/ref/fate/filter-pixdesc-yuv422p16be
	tests/ref/fate/filter-pixdesc-yuv422p16le
	tests/ref/fate/filter-pixdesc-yuv422p9be
	tests/ref/fate/filter-pixdesc-yuv422p9le
	tests/ref/fate/filter-pixdesc-yuv440p
	tests/ref/fate/filter-pixdesc-yuv444p
	tests/ref/fate/filter-pixdesc-yuv444p10be
	tests/ref/fate/filter-pixdesc-yuv444p10le
	tests/ref/fate/filter-pixdesc-yuv444p16be
	tests/ref/fate/filter-pixdesc-yuv444p16le
	tests/ref/fate/filter-pixdesc-yuv444p9be
	tests/ref/fate/filter-pixdesc-yuv444p9le
	tests/ref/fate/filter-pixdesc-yuva420p
	tests/ref/fate/filter-pixdesc-yuva420p10be
	tests/ref/fate/filter-pixdesc-yuva420p10le
	tests/ref/fate/filter-pixdesc-yuva420p16be
	tests/ref/fate/filter-pixdesc-yuva420p16le
	tests/ref/fate/filter-pixdesc-yuva420p9be
	tests/ref/fate/filter-pixdesc-yuva420p9le
	tests/ref/fate/filter-pixdesc-yuva422p
	tests/ref/fate/filter-pixdesc-yuva422p10be
	tests/ref/fate/filter-pixdesc-yuva422p10le
	tests/ref/fate/filter-pixdesc-yuva422p16be
	tests/ref/fate/filter-pixdesc-yuva422p16le
	tests/ref/fate/filter-pixdesc-yuva422p9be
	tests/ref/fate/filter-pixdesc-yuva422p9le
	tests/ref/fate/filter-pixdesc-yuva444p
	tests/ref/fate/filter-pixdesc-yuva444p10be
	tests/ref/fate/filter-pixdesc-yuva444p10le
	tests/ref/fate/filter-pixdesc-yuva444p16be
	tests/ref/fate/filter-pixdesc-yuva444p16le
	tests/ref/fate/filter-pixdesc-yuva444p9be
	tests/ref/fate/filter-pixdesc-yuva444p9le
	tests/ref/fate/filter-pixdesc-yuvj420p
	tests/ref/fate/filter-pixdesc-yuvj422p
	tests/ref/fate/filter-pixdesc-yuvj440p
	tests/ref/fate/filter-pixdesc-yuvj444p
	tests/ref/fate/filter-pixdesc-yuyv422
	tests/ref/fate/filter-pixdesc-yvyu422
	tests/ref/fate/filter-pixfmts-copy
	tests/ref/fate/filter-pixfmts-crop
	tests/ref/fate/filter-pixfmts-hflip
	tests/ref/fate/filter-pixfmts-null
	tests/ref/fate/filter-pixfmts-pad
	tests/ref/fate/filter-pixfmts-scale
	tests/ref/fate/filter-pixfmts-vflip
	tests/ref/fate/filter-scale200
	tests/ref/fate/filter-scale500
	tests/ref/fate/filter-vflip
	tests/ref/fate/filter-vflip_crop
	tests/ref/fate/filter-vflip_vflip
Merged-by: Michael Niedermayer <michaelni@gmx.at>

5e19651c

Merge commit '' · 1cf81a2c

Michael Niedermayer authored May 10, 2015

* commit '379e5603':
  id3v2: Do not export empty APIC description

Conflicts:
	libavformat/id3v2.c

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

1cf81a2c

Merge commit '' · f230451b

Michael Niedermayer authored May 10, 2015

* commit 'b9f7a677':
  png: Set the color range as full range

Conflicts:
	libavcodec/pngdec.c

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

f230451b

Merge commit '' · 55231323

Michael Niedermayer authored May 10, 2015

* commit '254f3dab':
  nut: Make sure to clean up on read_header failure

Conflicts:
	libavformat/nutdec.c

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

55231323

Merge commit '' · 73b8155b

Michael Niedermayer authored May 10, 2015

* commit '4d0ee496':
  avi: Validate sample_size

Conflicts:
	libavformat/avidec.c

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

73b8155b

Merge commit '' · 8b0ceb96

Michael Niedermayer authored May 10, 2015

* commit 'b34257ee':
  nut: Check chapter creation in decode_info_header

Conflicts:
	libavformat/nutdec.c

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

8b0ceb96

Merge commit '' · ce1c0e99

Michael Niedermayer authored May 10, 2015

* commit '243e8443':
  alac: Reject rice_limit 0 if compression is used

Conflicts:
	libavcodec/alac.c

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

ce1c0e99

dashenc: Reduce the segment duration if cutting out parts with edit lists · b8d2630c

Martin Storsjö authored May 10, 2015

This makes sure that the time + duration of the first segment
matches the start time of the next segment for e.g. AAC audio
with encoder delay.
Signed-off-by: Martin Storsjö <martin@martin.st>

b8d2630c

dashenc: replace attribute id with contentType for the AdaptationSet element · ac1a1cb9

James Almer authored May 10, 2015

id should be an integer, not a string. It is also optional, so use
contentType instead which is the proper attribute for these values.

This fixes an MPD validation error.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>

ac1a1cb9

Merge commit '' · 918c5ea4

Michael Niedermayer authored May 10, 2015

* commit '295e05a7':
  ape: Support _0000 files with nblock smaller than 64

Conflicts:
	libavcodec/apedec.c

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

918c5ea4

avformat/wavenc: Check umid length · 004564c9
Michael Niedermayer authored May 10, 2015
```
Fixes potential out of array read
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
004564c9
avformat/wavenc: fix string length variable types · ecb4ae78
Michael Niedermayer authored May 10, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
ecb4ae78
avcodec/ppc/h264qpel_template: Fix alignment assert · d0b29428
Michael Niedermayer authored May 10, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
d0b29428