Commits · 4d4bc89409fbe4e2d8e3ee705e6c51e546b9f816 · Linshizhi / ffmpeg.wasm-core

10 Apr, 2014 12 commits

avformat/mov: merge mov_read_custom_metadata() and mov_read_custom() · 4d4bc894
Michael Niedermayer authored Apr 10, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
4d4bc894

Michael Niedermayer authored Apr 10, 2014

* commit '9a07fac6':
  mov: read hydrogenaudio replaygain information

Conflicts:
	libavformat/Makefile
	libavformat/mov.c

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

6e573b77

avcodec/imgconvert: fix nb_components and depth for PAL8 in get_pix_fmt_score() · c486cfab

Michael Niedermayer authored Apr 10, 2014

This causes us to favor RGB8 over PAL8 when FF_LOSS_COLORQUANT is used

It probably makes sense to reinvestigate the exact scoring of pal8 when
our pal8 support improves to be supperior to rgb8
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

c486cfab

libx265: Only set the SAR if it is valid · cdd21f1f
Derek Buitenhuis authored Apr 10, 2014
```
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
```
cdd21f1f

libx265: Use 16-bit SAR · fcc43e02

Derek Buitenhuis authored Apr 10, 2014

The spec says it is 16 bits.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

fcc43e02

avcodec/x86: Exclude broken get_cabac under icl. · d1e6e5c8
Matt Oliver authored Apr 10, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
d1e6e5c8

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

Michael Niedermayer authored Apr 10, 2014

* qatar/master:
  libavfilter: Add asettb filter for setting timebase for audio

Conflicts:
	Changelog
	doc/filters.texi
	libavfilter/Makefile
	libavfilter/allfilters.c
	libavfilter/settb.c
	libavfilter/version.h

See: ba856c0b and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>

47647149

libx265: Use x265_param_parse to set the SAR · 8945dcbb
Derek Buitenhuis authored Apr 08, 2014
```
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
```
8945dcbb
mov: read hydrogenaudio replaygain information · 9a07fac6
Anton Khirnov authored Apr 01, 2014

9a07fac6

libavfilter: Add asettb filter for setting timebase for audio · ad8159e0

Nicolas George authored Apr 03, 2014

Ported asettb (including the sr option for audio sample rate) from FFmpeg,
and copied/modified the existing settb documentation for asettb.
Signed-off-by: Katerina Barone-Adesi <katerinab+libav@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>

ad8159e0

lavf/utils: fix mem leak · e1c48e35

Lukasz Marek authored Apr 09, 2014

Calling avformat_free_context() right after avformat_alloc_output_context2()
leaved option's default values not freed.
Options were freed only in av_write_trailer().
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

e1c48e35

sws: fix warning about RGB_PACK24_B_OPERANDS redefinition · fbf05759

Lukasz Marek authored Apr 09, 2014

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

fbf05759

09 Apr, 2014 28 commits

Merge remote-tracking branch 'cehoyos/master' · 421c116f

Michael Niedermayer authored Apr 09, 2014

* cehoyos/master:
  Fix a typo in amr.c.
  Remove an unneeded include of avassert.h from amr.c.
  Do not allow writing invalid wav channel layouts by default.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

421c116f

avcodec/mpegvideo_enc: change some asserts to av_asserts · 849d40dc
Michael Niedermayer authored Apr 09, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
849d40dc
avformat/nut: add ff_nut_audio_extra_tags to demuxer too · 968516ce
Michael Niedermayer authored Apr 09, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
968516ce
Fix a typo in amr.c. · cf79f202
Carl Eugen Hoyos authored Apr 09, 2014

cf79f202
Remove an unneeded include of avassert.h from amr.c. · 2a3ff9fb
Carl Eugen Hoyos authored Apr 09, 2014

2a3ff9fb
Do not allow writing invalid wav channel layouts by default. · bf87d582
Carl Eugen Hoyos authored Apr 09, 2014
```
Neither WMP nor QT play wav files with too large channel layouts.
Fixes ticket #3543.
```
bf87d582
avcodec/cngdec: use av_mallocz_array() · f703dae7
Michael Niedermayer authored Apr 09, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
f703dae7
avcodec/jpeglsdec/ff_jpegls_decode_lse: check len field validity · 2773ab36
Michael Niedermayer authored Apr 09, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
2773ab36
avcodec/jpeglsdec: ask for sample for "oversized image" · 020600ee
Michael Niedermayer authored Apr 09, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
020600ee
avcodec/mpeg12dec: drop confusing av_dlog() · 375013e3
Michael Niedermayer authored Apr 09, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
375013e3

avcodec/dirac_arith: Fix build with PIC and stack-check options · d8ab7f31

Anthoine Bourgeois authored Apr 09, 2014

Fixes Ticket3540

The function dirac_get_arith_bit in libavcodec/dirac_arith.h can't be
built with PIC and check-stack because the asm code needs 6 registers
and PIC and check-stack options take 1 each and x86 is quite limited
in this area.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

d8ab7f31

avutil/log: factor "level != AV_LOG_INFO/8" checks out · 7ac2f7e4
Michael Niedermayer authored Apr 09, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
7ac2f7e4
avcodec/sanm: use named consant instead of literal number · dddacf78
Michael Niedermayer authored Apr 09, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
dddacf78
avcodec/mpegvideo: remove AVFrame padding, as the hack isnt needed anymore · acf112ba
Michael Niedermayer authored Apr 09, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
acf112ba
avcodec/snowenc: remove operations that have become redundant with AVFrame pointers · 2ca553ed
Michael Niedermayer authored Apr 09, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
2ca553ed

Merge remote-tracking branch 'qatar/master' · 59a53842

Michael Niedermayer authored Apr 09, 2014

* qatar/master:
  mpegvideo: operate with pointers to AVFrames instead of whole structs

Conflicts:
	libavcodec/h261dec.c
	libavcodec/h263dec.c
	libavcodec/intrax8.c
	libavcodec/mpeg12enc.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo.h
	libavcodec/mpegvideo_enc.c
	libavcodec/mpegvideo_motion.c
	libavcodec/mpegvideo_xvmc.c
	libavcodec/msmpeg4.c
	libavcodec/ratecontrol.c
	libavcodec/vaapi.c
	libavcodec/vc1dec.c
	libavcodec/vdpau_vc1.c

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

59a53842

Merge commit '' · 60ef0c6f

Michael Niedermayer authored Apr 09, 2014

* commit '60fd7d36':
  fate: correctly set sample rate for mp2 tests

Conflicts:
	tests/fate/acodec.mak
	tests/lavf-regression.sh

one hunk has been ommited as it breaks fate
Merged-by: Michael Niedermayer <michaelni@gmx.at>

60ef0c6f

configure: Fail on missing prototypes in check_oc. · c740e083
Thilo Borgmann authored Apr 09, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
c740e083
avcodec/mpegaudioenc_template: reorder operations to prevent integer overflow · 44841528
Michael Niedermayer authored Apr 09, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
44841528
avcodec/mpegaudioenc_template: dont crash on bitrate=0 · 9d66aa2c
Michael Niedermayer authored Apr 09, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
9d66aa2c
swscale/input: replace assert() by av_assert1() · d98688ef
Michael Niedermayer authored Apr 09, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
d98688ef

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

Michael Niedermayer authored Apr 09, 2014

* qatar/master:
  doc: Completely document the x264 options

Conflicts:
	doc/encoders.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>

62432798

Merge commit '' · 43935842

Michael Niedermayer authored Apr 09, 2014

* commit '0d671ade':
  doc: Use a 3 columns multitable

Conflicts:
	doc/encoders.texi

No change as we dont use a multitable for this list
we could of course switch to one though if it looks better
comments welcome
Merged-by: Michael Niedermayer <michaelni@gmx.at>

43935842

Merge commit '' · 8f23045b

Michael Niedermayer authored Apr 09, 2014

* commit 'be59675a':
  doc: Change the multitable rendering in texi2pod

Conflicts:
	doc/texi2pod.pl
Merged-by: Michael Niedermayer <michaelni@gmx.at>

8f23045b

Merge commit '' · e40d92b1

Michael Niedermayer authored Apr 09, 2014

* commit '59388dac':
  fate: update tests for YVYU422 pixel format

Conflicts:
	tests/ref/fate/filter-pixdesc
	tests/ref/fate/filter-pixfmts-copy
	tests/ref/fate/filter-pixfmts-null
	tests/ref/fate/filter-pixfmts-scale
	tests/ref/fate/filter-pixfmts-vflip

No change as the fate tests where updated in the merges that changed
the scores
Merged-by: Michael Niedermayer <michaelni@gmx.at>

e40d92b1

Merge commit '' · 233dbee3

Michael Niedermayer authored Apr 09, 2014

* commit 'b6a09ef7':
  rawvideo: Support decoding YVYU422 FourCC

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

233dbee3

Merge commit '' · ed962414

Michael Niedermayer authored Apr 09, 2014

* commit '92b099da':
  swscale: support converting YVYU422 pixel format

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

ed962414

Merge commit '' · 0a1cc04e

Michael Niedermayer authored Apr 09, 2014

* commit '8b17243d':
  lavu: Add packed YVYU422 pixel format

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

0a1cc04e