Commits · 3339f87dbd3609cd13c9442adab33a1bb03da838 · Linshizhi / ffmpeg.wasm-core

22 Dec, 2011 9 commits

swr: increase LIBSWRESAMPLE_VERSION_MICRO to 100 · 3339f87d
Michael Niedermayer authored Dec 22, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
3339f87d
swr: add swresample_version swresample_configuration and swresample_license · 4468ad82
Michael Niedermayer authored Dec 22, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
4468ad82
libswscale: increase LIBSWSCALE_VERSION_MICRO to 100 · 0f91a577
Michael Niedermayer authored Dec 22, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
0f91a577
libpostproc: increase LIBPOSTPROC_VERSION_MICRO to 100 · 55a6d8d9
Michael Niedermayer authored Dec 22, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
55a6d8d9
libavdevice: increase LIBAVDEVICE_VERSION_MICRO to 100 · d5874e9c
Michael Niedermayer authored Dec 22, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
d5874e9c
libavformat: increase LIBAVFORMAT_VERSION_MICRO to 100 · 2a85358d
Michael Niedermayer authored Dec 22, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
2a85358d
libavutil: increase LIBAVUTIL_VERSION_MICRO to 100 · 1674073b
Michael Niedermayer authored Dec 22, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
1674073b

lavc: make 100 the base for the micro version number. · f0e90e00

Michael Niedermayer authored Dec 17, 2011

This way ffmpeg can be distinguished from the fork by a user
application or a encoded file by a decoder.
The highest value micro had, in the past, that i could find, was 6
thus 100 should be safe.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

f0e90e00

Merge remote-tracking branch 'qatar/master' · 52c522c7

Michael Niedermayer authored Dec 21, 2011

* qatar/master: (27 commits)
  asfdec: add side data to ASFStream packet instead of output packet.
  idroqdec: set AVFMTCTX_NOHEADER and create streams as they occur.
  nellymoserdec: Indicate that the decoder can handle changed parameters
  libavcodec: Apply parameter change side data when decoding audio
  flvdec: Add param change side data if the sample rate or channels have changed
  libavformat: Add a utility function for adding parameter change side data
  libavcodec: Define a side data type for parameter changes
  aacdec: Handle new extradata passed as side data
  flvdec: Export new AAC/H.264 extradata as side data on the next packet
  libavcodec: Define a side data type for new extradata
  flacdec: skip all track indices at once instead of looping.
  mxf: Add PictureEssenceCoding UL for V210.
  mxfdec: consider QuantizationBits between 17 and 24 to be pcm_s24*
  mxfenc: Add support for MPEG-2 MP@HL-14 in mxf container.
  mxf: H.264/MPEG-4 AVC Intra support
  configure: Show whether the safe bitstream reader is enabled
  x86: Tighten register constraints for decode_significance*_x86.
  Replace Subversion revisions in comments by Git hashes.
  h264_cabac: synchronize decode_significance_*_x86 conditionals
  w32threads: wait for the waked thread in pthread_cond_signal.
  ...

Conflicts:
	libavcodec/avcodec.h
	libavcodec/version.h
	libavformat/flvdec.c
	libavformat/utils.c
	tests/ref/lavfi/pixdesc
	tests/ref/lavfi/pixfmts_copy
	tests/ref/lavfi/pixfmts_null
	tests/ref/lavfi/pixfmts_scale
	tests/ref/lavfi/pixfmts_vflip
Merged-by: Michael Niedermayer <michaelni@gmx.at>

52c522c7

21 Dec, 2011 31 commits

error_concealment: optimize guess_dc() · a40f43db

Michael Niedermayer authored Dec 21, 2011

Fixes Ticket811
Bug found by: Oana Stratulat
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

a40f43db

ipmovie: fix FPE · 8d960fbc

Michael Niedermayer authored Dec 21, 2011

Fixed Ticket807
Bug found by: Oana Stratulat
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

8d960fbc

proresdec: Check yuv slice data sizes. · 2b73cddd

Michael Niedermayer authored Dec 21, 2011

Fixes overread
Fixes Ticket812
Bug found by: Oana Stratulat
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

2b73cddd

Clearer explanation of audio channel mapping restrictions · 7028c9f4
Tim Nicholson authored Dec 21, 2011

7028c9f4
asfdec: add side data to ASFStream packet instead of output packet. · e9dc9201
Justin Ruggles authored Dec 20, 2011
```
fixes memleak of side data
```
e9dc9201

idroqdec: set AVFMTCTX_NOHEADER and create streams as they occur. · 3f9257c5

Justin Ruggles authored Dec 20, 2011

This fixes demuxing of file where the first packet is not audio. Such files
are generated by our idroq muxer. It also fixes demuxing of audio only
idroq files.

3f9257c5

nellymoserdec: Indicate that the decoder can handle changed parameters · ce949481
Martin Storsjö authored Dec 16, 2011
```
Signed-off-by: Martin Storsjö <martin@martin.st>
```
ce949481
libavcodec: Apply parameter change side data when decoding audio · f13db94d
Martin Storsjö authored Dec 16, 2011
```
Signed-off-by: Martin Storsjö <martin@martin.st>
```
f13db94d
flvdec: Add param change side data if the sample rate or channels have changed · 2215c39e
Martin Storsjö authored Dec 16, 2011
```
Signed-off-by: Martin Storsjö <martin@martin.st>
```
2215c39e
libavformat: Add a utility function for adding parameter change side data · 3e79c2ad
Martin Storsjö authored Dec 16, 2011
```
Signed-off-by: Martin Storsjö <martin@martin.st>
```
3e79c2ad

libavcodec: Define a side data type for parameter changes · fe75dc85

Martin Storsjö authored Dec 15, 2011

Also define a codec capability for codecs that can handle
parameters changed externally between decoded packets.
Signed-off-by: Martin Storsjö <martin@martin.st>

fe75dc85

aacdec: Handle new extradata passed as side data · 132846b0
Martin Storsjö authored Dec 15, 2011
```
Signed-off-by: Martin Storsjö <martin@martin.st>
```
132846b0

flvdec: Export new AAC/H.264 extradata as side data on the next packet · 251f320f

Martin Storsjö authored Dec 15, 2011

Compared to just overwriting the old extradata, this has the
advantage of letting the decoder know exactly when the
extradata changed (otherwise it is changed immediately when the
new extradata packet is demuxed, even if there's old queued packets
awaiting to be decoded). This makes it easier for decoders to
actually react to the change, so they won't have to inspect
the extradata for each packet to see if it might have changed.

This works when sequentially playing a file with sample rate
changes, but if seeking past a new extradata packet in the
file, it obviously doesn't work properly. That case doesn't
work in flash player either, so it's probably ok not to handle
it.
Signed-off-by: Martin Storsjö <martin@martin.st>

251f320f

libavcodec: Define a side data type for new extradata · 195c123c
Martin Storsjö authored Dec 15, 2011
```
Signed-off-by: Martin Storsjö <martin@martin.st>
```
195c123c
doc: add a list of errno codes on some systems. · 1f797a58
Nicolas George authored Dec 21, 2011

1f797a58
mov: replace AVERROR(EOF) with AVERROR_EOF. · 20af3af5
Nicolas George authored Dec 20, 2011

20af3af5
mpeg12dec: reset first_field with picture_structure changes. · a40f6a5c
Michael Niedermayer authored Dec 21, 2011
```
Fixes Ticket809
Bug found by: Oana Stratulat
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
a40f6a5c
flacdec: skip all track indices at once instead of looping. · 17c84f4e
Paul B Mahol authored Dec 10, 2011
```
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
```
17c84f4e
mxf: Add PictureEssenceCoding UL for V210. · c15da594
Tomas Härdin authored Sep 26, 2011
```
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
```
c15da594
mxfdec: consider QuantizationBits between 17 and 24 to be pcm_s24* · 6547fd92
Tomas Härdin authored Sep 27, 2011
```
This fixes playback of BRD38772509.mxf.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
```
6547fd92

mxfenc: Add support for MPEG-2 MP@HL-14 in mxf container. · adff77f2

Daniel Kristjansson authored Sep 16, 2011

Support Main Profile at High 1440 Level in MXF container,
using essence coding label from SMPTE RDD 9, table 6.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>

adff77f2

mxf: H.264/MPEG-4 AVC Intra support · 4ee04247
Baptiste Coudurier authored Aug 14, 2011
```
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
```
4ee04247

Merge remote-tracking branch 'tjoppen/mxf_fixes_20111220' · 1fbb859c

Michael Niedermayer authored Dec 21, 2011

* tjoppen/mxf_fixes_20111220:
  mxfdec: Sanity-check SampleRate
  mxfdec: Make sure mxf->nb_index_tables > 0 in mxf_packet_timestamps()
  mxfdec: Remove unused variables
  mxfdec: Make sure x < index_table->nb_ptses
  mxfdec: Ignore the last entry in Avid's index table segments
Merged-by: Michael Niedermayer <michaelni@gmx.at>

1fbb859c

lavc: Do not fail audio decoding if user has set a custom get_buffer. · c3846e3e
Michael Niedermayer authored Dec 21, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
c3846e3e
configure: Show whether the safe bitstream reader is enabled · 9c984b1b
Martin Storsjö authored Dec 21, 2011
```
Signed-off-by: Martin Storsjö <martin@martin.st>
```
9c984b1b

x86: Tighten register constraints for decode_significance*_x86. · 6fdb2ce3

Diego Biurrun authored Dec 21, 2011

On 32-bit OS X with gcc 4.0/4.2 and shared libraries enabled, the ebx register
is not available, but required to assemble the functions.

This reverts commit 8742a4ff to a simplified version of the original constraints.

6fdb2ce3

Replace Subversion revisions in comments by Git hashes. · c1836540
Diego Biurrun authored Dec 20, 2011

c1836540
h264_cabac: synchronize decode_significance_*_x86 conditionals · 8742a4ff
Diego Biurrun authored Dec 20, 2011
```
The definition and the call site where under different #ifdefs.
```
8742a4ff

w32threads: wait for the waked thread in pthread_cond_signal. · 2003a292

Sergey Radionov authored Dec 21, 2011

This fixes a deadlock VLC triggered with multithreaded decoding. The
wait forces one of the current waiters to wake and not the thread
which calls pthread_cond_signal() itself.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>

2003a292

avio: remove ENOTSUP mention in doxy as its not available on all supported platforms · 077b086d
Michael Niedermayer authored Dec 21, 2011
```
and thus cannot be used
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
077b086d

Merge remote-tracking branch 'qatar/master' · 3be1a4ba

Michael Niedermayer authored Dec 21, 2011

* qatar/master:
  lavc: always align height by 32 pixel
  raw: add 10bit YUV definitions
  nut: support 10bit YUV
  mpegvideo_enc: separate declarations and statements
  oma: make header compile standalone
  vp3: Reorder some functions to fix VP3 build with Theora disabled.
  build: fix standalone compilation of ADX encoder
  build: fix standalone compilation of ADPCM decoders
  build: fix standalone compilation of mpc7/mpc8 decoders
  4xm: Use bytestream2 functions to prevent overreads
  bytestream: add a new set of bytestream functions with overread checking
  mpegts: Suppress invalid timebase warnings on DMB streams.
  mpegts: Fix typo in handling sections in the PMT.
  vc1dec: Use the right pointer type for the tmp pointer

Conflicts:
	libavcodec/4xm.c
	libavcodec/utils.c
	libavcodec/vc1dec.c
	libavcodec/vp3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

3be1a4ba