Commits · b61cb61ab8f9abca98cc8c4d67cbefdb30f1e82a · Linshizhi / ffmpeg.wasm-core

19 Mar, 2015 3 commits

mxfenc: don't try to write footer without header · b61cb61a

Andreas Cadhalpun authored Mar 18, 2015

This fixes a crash, when trying to mux h264 into mxf_opatom.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Previous version reviewed-by: tomas.hardin@codemill.se
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

b61cb61a

avformat/aiffdec: do not fail if header parser hits EOF · c5c09501

Michael Niedermayer authored Mar 19, 2015

Based on patch by Martin Vignali <martin.vignali@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

c5c09501

avformat/aiffdec: Stop header parsing once a non header packet is reached · ae81e8a9

Michael Niedermayer authored Mar 19, 2015

Fix Ticket3530

Based-on debuging work by Martin Vignali <martin.vignali@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ae81e8a9

18 Mar, 2015 17 commits

avfilter/vf_colormatrix: fix yuv420p threading, second try · d2009c77
Clément Bœsch authored Mar 18, 2015
```
Now seems to work fine with different combinations of odd/even heights
and odd/even number of threads.
```
d2009c77
avcodec/mjpegdec: Support 31111100 sampling · b1fbe29e
Michael Niedermayer authored Mar 18, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
b1fbe29e
avcodec/mjpegdec: Change upscale_* to an array instead of a bitmask · e1545589
Michael Niedermayer authored Mar 18, 2015
```
This allows storing integer factors instead of just 0 and 1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
e1545589

Merge remote-tracking branch 'cehoyos/master' · ee648903

Michael Niedermayer authored Mar 18, 2015

* cehoyos/master:
  lavf/mkv: Ignore ff_isom_write_hvcc() return value as the mov muxer does.
  lavc/dts: Do not set bitrate for DTS-HD Master and High Resolution.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

ee648903

Merge commit '' · b3818c47

Michael Niedermayer authored Mar 18, 2015

* commit '8692d74b':
  mov: Add option to keep exact packet sequence after seeking

Conflicts:
	libavformat/isom.h
	libavformat/mov.c
	libavformat/version.h

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

b3818c47

lavf/mkv: Ignore ff_isom_write_hvcc() return value as the mov muxer does. · 7a5356c7
Carl Eugen Hoyos authored Mar 18, 2015
```
This change allows remuxing hevc from mpeg-ts to Matroska.
```
7a5356c7
lavc/dts: Do not set bitrate for DTS-HD Master and High Resolution. · 7f1ea388
Carl Eugen Hoyos authored Mar 18, 2015
```
Fixes ticket #4375.

Reviewed-by: Hendrik Leppkes
```
7f1ea388
avformat/http: replace cookies with updated values instead of appending forever · c59654d6
Micah Galizia authored Mar 17, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
c59654d6

mips/float_dsp: fix vector_fmul_window_mips on mips64 · f8323744

James Cowgill authored Mar 18, 2015

Commit dfa92080 ("mips/float_dsp: fix a bug in vector_fmul_window_mips")
fixed vector_fmul_window_mips by unrolling the loop only 4 times, but also
removed the outer C loop and replaced it with assembly branches and pointer
arithmetic. When submitting my 64-bit porting patch I missed this new
assembly which also needed porting.

This patch fixes a bus error in the fate-float-dsp test when run on 64-bit
mips.
Signed-off-by: James Cowgill <james410@cowgill.org.uk>
Reviewed-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

f8323744

mov: Add option to keep exact packet sequence after seeking · 414d6547

Derek Buitenhuis authored Mar 17, 2015

The current behavior may produce a different sequence of packets
after seeking, compared to demuxing linearly from the beginning.
This is because the MOV demuxer seeks in each stream individually,
based on timestamp, which may set each stream at a slightly different
position than if the file would have been read sequentially.

This makes implementing certain operations, such as segmenting,
quite hard, and slower than need be.

Therefore, add an option which retains the same packet sequence
after seeking, as when a file is demuxed linearly.

414d6547

mov: Add option to keep exact packet sequence after seeking · 8692d74b

Derek Buitenhuis authored Mar 16, 2015

The current behavior may produce a different sequence of packets
after seeking, compared to demuxing linearly from the beginning.
This is because the MOV demuxer seeks in each stream individually,
based on timestamp, which may set each stream at a slightly different
position than if the file would have been read sequentially.

This makes implementing certain operations, such as segmenting,
quite hard, and slower than need be.

Therefore, add an option which retains the same packet sequence
after seeking, as when a file is demuxed linearly.

8692d74b

avfilter/vf_lut3d: Change enum to int, which is accessed via AVOption as int · fbb9ef5b
Michael Niedermayer authored Mar 18, 2015
```
This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
fbb9ef5b
avfilter/vf_il: Change enums to int, which are accessed via AVOption as int · ee17295d
Michael Niedermayer authored Mar 18, 2015
```
This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
ee17295d
avfilter/vf_histogram: Change enum to int, which is accessed via AVOption as int · 67e15622
Michael Niedermayer authored Mar 18, 2015
```
This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
67e15622

lavfi: add showwavespic filter · 304fdfe9

Clément Bœsch authored Dec 24, 2014

This is a variant of showwaves. It is implemented as a different filter
so that the user is not allowed to use meaningless options which belong
to showwaves (such as rate).

Major edits done by Stefano Sabatini, from a patch by ubitux.

See thread:
From: Clément Bœsch <u@pkh.me>
To: ffmpeg-devel@ffmpeg.org
Date: Wed, 24 Dec 2014 15:03:26 +0100
Subject: [FFmpeg-devel] [PATCH] avfilter/showwaves: add single_pic option

304fdfe9

Replace PixelFormats which sneaked in over time or where forgotten by AVPixelFormats · 0f16dfda
Michael Niedermayer authored Mar 18, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
0f16dfda

Merge commit '' · 4fae5563

Michael Niedermayer authored Mar 18, 2015

* commit '58a840e2':
  Replace a few leftover instances of enum PixelFormat with enum AVPixelFormat

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

4fae5563

17 Mar, 2015 20 commits

avcodec/ac3dec_fixed: fix compilation when ac3dec is disabled · bf2bd5b8
James Almer authored Mar 17, 2015
```
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
```
bf2bd5b8

avcodec/aacsbr: Replace impossible condition by assert · 0b961423

Michael Niedermayer authored Mar 17, 2015

bits can have a value of 0 or 1 they are never -1 or otherwise negative
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

0b961423

Replace a few leftover instances of enum PixelFormat with enum AVPixelFormat · 58a840e2
Martin Storsjö authored Mar 17, 2015
```
Signed-off-by: Martin Storsjö <martin@martin.st>
```
58a840e2

Merge commit '' · ae3d2afd

Michael Niedermayer authored Mar 17, 2015

* commit '6289706b':
  fate: Move tdsc to the appropriate screen capture file

Conflicts:
	tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>

ae3d2afd

Merge commit '' · c7e1e4c4

Michael Niedermayer authored Mar 17, 2015

* commit '423f5d50':
  mov: Fix little endian audio detection

Conflicts:
	libavformat/mov.c

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

c7e1e4c4

Merge commit '' · 45f62c74

Michael Niedermayer authored Mar 17, 2015

* commit 'cdce9e80':
  aacsbr: Fix type for index variable

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

45f62c74

Merge commit '' · 66de11b0

Michael Niedermayer authored Mar 17, 2015

* commit '7c60c124':
  hqx: Drop unused offsets table
Merged-by: Michael Niedermayer <michaelni@gmx.at>

66de11b0

Merge commit '' · 07ca090e

Michael Niedermayer authored Mar 17, 2015

* commit '4326bc36':
  lavf: Do not list mov-only codecs in riff tags

Conflicts:
	libavformat/Makefile
	libavformat/avidec.c

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

07ca090e

Merge commit '' · de732a82

Michael Niedermayer authored Mar 17, 2015

* commit 'cf9861de':
  isom: Add X-Com Radvision FourCC

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

de732a82

Merge commit '' · 59f687b7

Michael Niedermayer authored Mar 17, 2015

* commit '02d76141':
  riff: Add 'tshd' FourCC for H.264

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

59f687b7

Merge commit '' · 182499be

Michael Niedermayer authored Mar 17, 2015

* commit 'c0f504e9':
  libx264: Allow full-range yuv422 and yuv444 pixel formats

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

182499be

Merge commit '' · 6d57da9a

Michael Niedermayer authored Mar 17, 2015

* commit 'c9ed48e8':
  dca: Read params->pancABIT0[param_index] only if part0 is set
Merged-by: Michael Niedermayer <michaelni@gmx.at>

6d57da9a

Merge commit '' · 1eb28479

Michael Niedermayer authored Mar 17, 2015

* commit '48aef27f':
  x86: Put COPY3_IF_LT under HAVE_6REGS

Conflicts:
	libavcodec/x86/mathops.h

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

1eb28479

avfilter/vf_colormatrix: make sure the number of threads is even for yuv420p · 09f05717

Clément Bœsch authored Mar 17, 2015

Fix crash with for example:
  ffmpeg -f lavfi -i testsrc=568x320 -threads 3 -vf format=yuv420p,colormatrix=bt709:smpte170m -f null -

09f05717

Merge commit '' · 2cfa1fdb

Michael Niedermayer authored Mar 17, 2015

* commit '96dd0442':
  isom: Add support for TSCC2
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2cfa1fdb

Merge commit '' · 33a79e44

Michael Niedermayer authored Mar 17, 2015

* commit '91894f27':
  configure: Disable shift operator precedence warnings with MSVC

Conflicts:
	configure

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

33a79e44

avformat/mov: fix mis-detection of jpeg2000 · 13f8bbfb
Michael Niedermayer authored Mar 17, 2015
```
Fixes demuxer choice for Ticket 2792
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
13f8bbfb
avfilter/vf_histeq: Change enums to int, which are accessed via AVOption as int · 6cd079a4
Michael Niedermayer authored Mar 17, 2015
```
This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
6cd079a4
avfilter/vf_fieldmatch: Change enums to int, which are accessed via AVOption as int · 73638897
Michael Niedermayer authored Mar 17, 2015
```
This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
73638897
avfilter/vf_field: Change enum to int, which is accessed via AVOption as int · e6140e78
Michael Niedermayer authored Mar 17, 2015
```
This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
e6140e78