Commits · bd4dc9e71775815b8c2aa789967cd971c324a2e1 · Linshizhi / ffmpeg.wasm-core

30 Apr, 2014 22 commits

fate/hevc: update with new sequences from jctvc(cherry picked from commit... · bd4dc9e7

Mickaël Raulet authored Apr 29, 2014

fate/hevc: update with new sequences from jctvc(cherry picked from commit de6d9c586bd3852dfbe629a88ccc8c0f0a2bfcbb)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

bd4dc9e7

Merge commit '' · a1ac27bc

Michael Niedermayer authored Apr 30, 2014

* commit '7d027b9d':
  librtmp: Map native options to librtmp ones when possible
Merged-by: Michael Niedermayer <michaelni@gmx.at>

a1ac27bc

Merge commit '' · 554a1eca

Michael Niedermayer authored Apr 30, 2014

* commit '7266e24f':
  hls: Sync the file number with the start sequence

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

554a1eca

Merge commit '' · 5b4c8aac

Michael Niedermayer authored Apr 30, 2014

* commit 'a1643103':
  hls: Factor the sequence computation

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

5b4c8aac

Merge commit '' · 8522dd38

Michael Niedermayer authored Apr 30, 2014

* commit 'c7603b3c':
  hls: Print start_number as first sequence value

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

8522dd38

Merge commit '' · 67979b59

Michael Niedermayer authored Apr 30, 2014

* commit '87a3ea31':
  segment: Report the current media sequence

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

67979b59

Merge commit '' · f21f969a

Michael Niedermayer authored Apr 30, 2014

* commit '344f7b5a':
  hls: Report the current media sequence
Merged-by: Michael Niedermayer <michaelni@gmx.at>

f21f969a

librtmp: Map native options to librtmp ones when possible · 7d027b9d
Luca Barbato authored Apr 26, 2014
```
Makes the two protocols nearly seamless.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
```
7d027b9d
avcodec/flacenc: Use av_malloc_array() · 0eb9482e
Michael Niedermayer authored Apr 30, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
0eb9482e
avcodec/ivi_common: Use av_mallocz_array() · f08ca91b
Michael Niedermayer authored Apr 30, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
f08ca91b
avcodec/mjpegdec: use av_mallocz_array() · 8532566e
Michael Niedermayer authored Apr 30, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
8532566e
hls: Sync the file number with the start sequence · 7266e24f
Luca Barbato authored Apr 29, 2014

7266e24f
hls: Factor the sequence computation · a1643103
Luca Barbato authored Apr 29, 2014

a1643103
hls: Print start_number as first sequence value · c7603b3c
Luca Barbato authored Apr 29, 2014
```
The option now behaves as expected.
```
c7603b3c
segment: Report the current media sequence · 87a3ea31
Luca Barbato authored Apr 29, 2014
```
Useful for debugging mostly.
```
87a3ea31
hls: Report the current media sequence · 344f7b5a
Luca Barbato authored Apr 29, 2014
```
Useful for debugging mostly.
```
344f7b5a
avcodec/tiff: Support 410 and 440 YCbCr · 1e25afc1
Michael Niedermayer authored Apr 30, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
1e25afc1

ff_put_wav_header: add flag to force WAVEFORMATEX · 5e7d21c7

Daniel Verkamp authored Apr 30, 2014

Partially undoes commit 2c4e08d8:

    riff: always generate a proper WAVEFORMATEX structure in
    ff_put_wav_header

A new flag, FF_PUT_WAV_HEADER_FORCE_WAVEFORMATEX, is added to force the
use of WAVEFORMATEX rather than PCMWAVEFORMAT even for PCM codecs.

This flag is used in the Matroska muxer (the cause of the original
change) and in the ASF muxer, because the specifications for
these formats indicate explicitly that WAVEFORMATEX should be used.

Muxers for other formats will return to the original behavior of writing
PCMWAVEFORMAT when writing a header for raw PCM.

In particular, this causes raw PCM in WAV to generate the canonical
44-byte header expected by some tools.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

5e7d21c7

Merge remote-tracking branch 'lukaszmluki/master' · bb6d00f0

Michael Niedermayer authored Apr 30, 2014

* lukaszmluki/master:
  lavd/pulse_audio_enc: respect minreq while checking buffer fullness
  lavd/pulse_audio_enc: signal that buffer is still writable after write
  lavd/pulse_audio_enc: add pointer checks
  lavd/pulse_audio_enc: add more buffer attributes
  lavd/fbdev_dec: implement fbdev_get_device_list callback
  lavd/fbdev_enc: move list device code to fbdev_common
  lavd/fbdev_enc: remove redundant assignments
Merged-by: Michael Niedermayer <michaelni@gmx.at>

bb6d00f0

sws: dont use the optimized 410->420 unscaled conversion when height%4 · 421b21ca
Michael Niedermayer authored Apr 30, 2014
```
Fixes Ticket3594
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
421b21ca
avcodec/vorbisdec: use av_malloc(z)_array() · f0c78b07
Michael Niedermayer authored Apr 30, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
f0c78b07
avcodec/vorbisdec: try to workaround libvorbisenc bug · 0a266cb5
Michael Niedermayer authored Apr 30, 2014
```
Fixes Ticket3590
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
0a266cb5

29 Apr, 2014 18 commits

Merge commit '' · 5b393766

Michael Niedermayer authored Apr 29, 2014

* commit 'a7c5fdda':
  avconv_dxva2: define all used GUIDs directly instead of relying on the dxva2api.h header
Merged-by: Michael Niedermayer <michaelni@gmx.at>

5b393766

Merge commit '' · 37ce3188

Michael Niedermayer authored Apr 29, 2014

* commit '9d76dd95':
  h264: drop commented out cruft

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

37ce3188

lavd/pulse_audio_enc: respect minreq while checking buffer fullness · 5bef4878
Lukasz Marek authored Apr 29, 2014
```
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
```
5bef4878
lavd/pulse_audio_enc: signal that buffer is still writable after write · f817d550
Lukasz Marek authored Apr 29, 2014
```
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
```
f817d550
lavd/pulse_audio_enc: add pointer checks · a1e5be5c
Lukasz Marek authored Apr 29, 2014
```
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
```
a1e5be5c
lavd/pulse_audio_enc: add more buffer attributes · 954a8f44
Lukasz Marek authored Apr 28, 2014
```
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
```
954a8f44
lavd/fbdev_dec: implement fbdev_get_device_list callback · e2ebaa09
Lukasz Marek authored Apr 28, 2014
```
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
```
e2ebaa09
lavd/fbdev_enc: move list device code to fbdev_common · 279ff8d2
Lukasz Marek authored Apr 27, 2014
```
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
```
279ff8d2
lavd/fbdev_enc: remove redundant assignments · 3050e53f
Lukasz Marek authored Apr 27, 2014
```
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
```
3050e53f

Merge commit '' · b3d48c31

Michael Niedermayer authored Apr 29, 2014

* commit 'c1f92d13':
  mpegvideo: remove unused MpegEncContext.b4_stride
Merged-by: Michael Niedermayer <michaelni@gmx.at>

b3d48c31

Merge commit '' · 8b30702c

Michael Niedermayer authored Apr 29, 2014

* commit '6a13505c':
  mpegvideo: move the MpegEncContext fields used from arm asm to the beginning
Merged-by: Michael Niedermayer <michaelni@gmx.at>

8b30702c

ffmpeg: dont print "Conversion failed" if conversion has never started · ed72dae4
Michael Niedermayer authored Apr 29, 2014
```
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
ed72dae4

avcodec/hevc: fix no output of prior pics and pic output flags(cherry picked... · 2eddf3a6

gcocherel authored Apr 29, 2014

avcodec/hevc: fix no output of prior pics and pic output flags(cherry picked from commit e99b96dff1d76d74cb5633aa9702828d863050e2)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

2eddf3a6

cmdutils: omit deprecated codec ids in help output · 978c193d

Michael Niedermayer authored Apr 29, 2014

These ids should be meaningless for the end user and would only
confuse
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

978c193d

avformat/xwma: fix memleak of dpds_table · 375a0c03
Michael Niedermayer authored Apr 29, 2014
```
Fixes CID1087092
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
375a0c03
avformat/xwma: improve error codes · cf4dbe9a
Michael Niedermayer authored Apr 29, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
cf4dbe9a
avformat/xwma: use NULL instead of 0 for pointers · c31ad87b
Michael Niedermayer authored Apr 29, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
c31ad87b

Merge remote-tracking branch 'cigaes/master' · 03b88f6b

Michael Niedermayer authored Apr 29, 2014

* cigaes/master:
  lavfi/drawtext: allow to format pts as HH:MM:SS.mmm.
  lavf/concatdec: implement automatic conversions.
  lavf/concatdec: reindent after last commit.
  lavf/concatdec: always do stream matching.
  lavf/concatdec: check match_streams() return value.
  lavf/concatdec: use a structure for each stream.
  ffprobe: use the codec descriptor if no decoder was found.
  lavf/matroska: add "binary" pseudo-MIME type.
  lavc: minor bump and APIchanges for AVCodecDescriptor.mime_types.
  lavc: add a mime_types field to codec descriptors.
  lavc: add AV_CODEC_ID_BIN_DATA.
  lavc: add codec descriptors for TTF and OTF.
  lavc: add codec descriptors for deprecated ids.
  lavc/codec_desc: add separation comment.
  tools/ffhash: implement base64 output.
  tools/ffhash: use av_hash_final_hex().
  lavu/hash: add hash_final helpers.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

03b88f6b