]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Wed, 5 Jun 2013 09:26:26 +0000 (11:26 +0200)]
Merge commit '
ab1189766a82a95f108005463cde75f73fcc0ae5 '
* commit '
ab1189766a82a95f108005463cde75f73fcc0ae5 ':
movenc: Increase the cluster array allocation by doubling
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 5 Jun 2013 09:19:16 +0000 (11:19 +0200)]
Merge commit '
3b4feac1ec14f861bdd7f494f288f4d8dd7f449e '
* commit '
3b4feac1ec14f861bdd7f494f288f4d8dd7f449e ':
movenc: Keep track of the allocated size for the cluster array
mem: Add av_realloc_array and av_reallocp_array
Conflicts:
doc/APIchanges
libavformat/movenc.c
libavutil/mem.c
libavutil/mem.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Sat, 1 Jun 2013 23:26:03 +0000 (16:26 -0700)]
doc/encoders: add documentation for libtwolame
Michael Niedermayer [Wed, 5 Jun 2013 00:49:00 +0000 (02:49 +0200)]
swr: dont treat 32 and 24 as equal in simple copy check
Fixes dithering from 32 to 24 bit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 5 Jun 2013 00:47:19 +0000 (02:47 +0200)]
swr: set scale for 32->32/24 dither
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Tue, 4 Jun 2013 22:06:23 +0000 (00:06 +0200)]
lavfi/mp: remove mp=sab
The filter was ported to a native libavfilter filter.
Stefano Sabatini [Mon, 3 Jun 2013 11:34:04 +0000 (13:34 +0200)]
lavfi: port sab filter from libmpcodecs
Paul B Mahol [Tue, 4 Jun 2013 11:56:14 +0000 (11:56 +0000)]
swresample: set flags & description and add documentation for output_sample_bits
Allows users to actually use such option.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Tue, 4 Jun 2013 21:38:28 +0000 (23:38 +0200)]
swr: Fix dithering of s16 with SIMD
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 4 Jun 2013 21:35:19 +0000 (23:35 +0200)]
swr: add native_simd_one
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Tue, 4 Jun 2013 21:43:59 +0000 (21:43 +0000)]
doc/general: update after
e4e4add0e3ba7
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Tue, 4 Jun 2013 18:34:38 +0000 (20:34 +0200)]
pngdec: dont treat mpng like png with key and non keyframes
Fixes Ticket2618
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Mon, 3 Jun 2013 21:38:40 +0000 (23:38 +0200)]
Use av_log() instead of fprintf() in ffplay.
Fixes ticket #2630.
Reviewed-by: Marton Balint
Paul B Mahol [Tue, 4 Jun 2013 17:25:32 +0000 (17:25 +0000)]
tak: simplify ff_tak_check_crc()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Tue, 4 Jun 2013 12:54:58 +0000 (14:54 +0200)]
swresample/rematrix: add S32 mixing code
Needed for dithering S32
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 4 Jun 2013 12:53:58 +0000 (14:53 +0200)]
wresample/rematrix_template: fix internal types
Should make no difference, but future commits will need it
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andrey Semashev [Mon, 3 Jun 2013 10:32:48 +0000 (13:32 +0300)]
movenc: Increase the cluster array allocation by doubling
The previous allocation increment of 16384 meant that the cluster
array was allocated for 0.6 MB initially, which is a bit excessive
for cases with fragmentation where only a fraction of that ever
actually is used.
Therefore, start off at a much smaller value, and increase by
doubling (to avoid reallocating too often when writing long
non-fragmented mp4 files).
Bug-Id: 525
Signed-off-by: Martin Storsjö <martin@martin.st>
Andrey Semashev [Sun, 2 Jun 2013 19:57:31 +0000 (22:57 +0300)]
movenc: Keep track of the allocated size for the cluster array
When writing fragmented mp4, the cluster array is reset when a
fragment is written. Instead of starting off reallocating the
array only based on the number of current elements in it, keep
track of how many elements there were allocated earlier.
This avoids reallocating this array needlessly when writing
fragmented mp4 files.
Bug-Id: 525
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Mon, 3 Jun 2013 09:31:46 +0000 (12:31 +0300)]
mem: Add av_realloc_array and av_reallocp_array
These help avoiding overflows and simplify error handling.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Tue, 4 Jun 2013 11:56:01 +0000 (13:56 +0200)]
Merge remote-tracking branch 'lukaszmluki/master'
* lukaszmluki/master:
ftp: fix using uninitialized value
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 4 Jun 2013 11:19:27 +0000 (13:19 +0200)]
ffserver: fix null pointer dereference
Fixes CID732208
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Tue, 4 Jun 2013 11:03:13 +0000 (13:03 +0200)]
ftp: fix using uninitialized value
Fix coverity issue CID
1026777
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Michael Niedermayer [Tue, 4 Jun 2013 00:27:21 +0000 (02:27 +0200)]
vc1dec: Disable dead code
Fixes CID732197/6
A assert is added to check that the disabled code wont
be needed in the future.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Mon, 3 Jun 2013 22:16:02 +0000 (22:16 +0000)]
lavf/aacdec: add support for reading ape tags
Closes #2634.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Mon, 3 Jun 2013 22:52:50 +0000 (22:52 +0000)]
tta: add support for reading ape tags
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Mon, 3 Jun 2013 22:26:16 +0000 (22:26 +0000)]
tta: return meaningful error codrs
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Mon, 3 Jun 2013 19:21:17 +0000 (19:21 +0000)]
flacdec: use init_get_bits8()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Mon, 3 Jun 2013 18:20:55 +0000 (20:20 +0200)]
Merge branch 'master' of https://github.com/upsuper/ffmpeg-vdadec
* 'master' of https://github.com/upsuper/ffmpeg-vdadec:
vda_h264_dec: remove check_format
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Jun 2013 14:11:29 +0000 (16:11 +0200)]
avformat/network: check the return value from setsockopt()
Fixes: CID1026742
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Jun 2013 14:07:06 +0000 (16:07 +0200)]
matroskadec: fix memleak of pkt_data
Fixes: CID1026767
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Jun 2013 14:05:09 +0000 (16:05 +0200)]
matroskadec: favor av_freep()
av_freep() is safer as it zeros the pointer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Jun 2013 13:41:29 +0000 (15:41 +0200)]
avfilter/vf_mcdeint: free frame on error
Fixes CID1026766
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Jun 2013 13:26:50 +0000 (15:26 +0200)]
avfilter/process_options: fix memleak
Fixes CID1026765
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Jun 2013 12:51:28 +0000 (14:51 +0200)]
avfilter/af_astats: rename stat()
See CID1026741
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Jun 2013 12:40:15 +0000 (14:40 +0200)]
tiff: fix memleak
Fixes CID1026764
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Jun 2013 12:37:16 +0000 (14:37 +0200)]
jpeg2000dec: assert that curtileno is valid when used
Fixes CID1026755
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Jun 2013 12:30:09 +0000 (14:30 +0200)]
jpeg2000: Fix unintended sign extension in malloc arguments of prec
Fixes: CID1026772/3
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Jun 2013 12:16:19 +0000 (14:16 +0200)]
jpeg2000: Fix Unintended sign extension in malloc arguments of cblk.
Fixes CID1026770
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Jun 2013 12:09:12 +0000 (14:09 +0200)]
h264_ps: fix memleak in ff_h264_decode_picture_parameter_set()
Fixes: CID1026763
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Jun 2013 12:06:25 +0000 (14:06 +0200)]
ffv1enc: Check return value of av_frame_ref()
Fixes CID1026740
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 2 Jun 2013 20:21:14 +0000 (22:21 +0200)]
avcodec/jpeg2000dwt: merge rescaling with interleave in 9/7 int IDWT
Tha fate tests change because the edge mirroring was wrong before this commit
Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 2 Jun 2013 20:18:29 +0000 (22:18 +0200)]
avcodec/jpeg2000dwt: merge rescaling with interleave in 9/7 float IDWT
10% faster
Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 1 Jun 2013 16:31:19 +0000 (18:31 +0200)]
jpeg2000dec; optimize output sample convert a bit
67935 -> 29984 kcycles
Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Jun 2013 10:54:35 +0000 (12:54 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
movenc: Change the track struct name to match the typedef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Jun 2013 10:42:31 +0000 (12:42 +0200)]
Merge commit '
2d66a58ccde05e764594bd7e5f0f9244634d0b2c '
* commit '
2d66a58ccde05e764594bd7e5f0f9244634d0b2c ':
Go2Webinar decoder
Conflicts:
Changelog
configure
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/version.h
libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Jun 2013 10:33:00 +0000 (12:33 +0200)]
Merge commit '
31980b6abdd8ffb6953472a7a6b59f3aa5762c31 '
* commit '
31980b6abdd8ffb6953472a7a6b59f3aa5762c31 ':
vmd: decode videos with no LZ buffer size provided - they might not need it
Conflicts:
libavcodec/vmdav.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Jun 2013 10:21:25 +0000 (12:21 +0200)]
Merge commit '
0aed0bfc62b273a780a2bfba3be56039fccd7423 '
* commit '
0aed0bfc62b273a780a2bfba3be56039fccd7423 ':
vmd: fix mode 3 decoding
Conflicts:
libavcodec/vmdav.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Jun 2013 09:53:05 +0000 (11:53 +0200)]
Merge commit '
c011ceef78eae66039efc66d9551a7146e08838a '
* commit '
c011ceef78eae66039efc66d9551a7146e08838a ':
swscale: ppc: Remove commented-out define cruft
nsvdec: Remove commented-out debug cruft
cpu: Restructure code to avoid pointless ret variable indirection
Conflicts:
libavutil/cpu.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Jun 2013 09:44:11 +0000 (11:44 +0200)]
Merge commit '
46ce9ded96ffcb798b03da894cdb5fdac376a6ee '
* commit '
46ce9ded96ffcb798b03da894cdb5fdac376a6ee ':
tiff: K&R formatting cosmetics
Conflicts:
libavcodec/tiff.c
libavcodec/tiff.h
libavcodec/tiffenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Sun, 2 Jun 2013 20:29:04 +0000 (23:29 +0300)]
movenc: Change the track struct name to match the typedef
This makes the struct name (which isn't used anywhere) match the
name of the typedef, as for all the other structs declared in this
header.
Signed-off-by: Martin Storsjö <martin@martin.st>
Kostya Shishkov [Mon, 25 Feb 2013 20:38:25 +0000 (21:38 +0100)]
Go2Webinar decoder
Michael Niedermayer [Mon, 3 Jun 2013 00:59:10 +0000 (02:59 +0200)]
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
lavfi/trim: mark link closed on EOF.
ffmpeg: ignore EOF when pushing frames to filters.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Mon, 3 Jun 2013 00:19:37 +0000 (00:19 +0000)]
jpeg2000dec: remove redundant error log message
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Mon, 3 Jun 2013 00:16:39 +0000 (00:16 +0000)]
wavpack: remove redundant error log message
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sun, 2 Jun 2013 22:43:31 +0000 (22:43 +0000)]
tta: use interger instead of pointer to iterate output samples for 24-bit case
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sun, 2 Jun 2013 22:32:19 +0000 (22:32 +0000)]
tta: move GetBitContext out of private context
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Nicolas George [Sun, 2 Jun 2013 09:35:04 +0000 (11:35 +0200)]
lavfi/trim: mark link closed on EOF.
Fix trac ticket #2620.
Nicolas George [Sun, 2 Jun 2013 09:30:52 +0000 (11:30 +0200)]
ffmpeg: ignore EOF when pushing frames to filters.
EOF is not a fatal condition, it is normally produced
by a few filters.
TODO: take it into account to avoid useless decoding.
Michael Niedermayer [Sun, 2 Jun 2013 21:10:44 +0000 (23:10 +0200)]
tools/qt-faststart: Fix unintended sign extension of current_offset
Fixes: CID733809
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 2 Jun 2013 21:07:06 +0000 (23:07 +0200)]
tools/qt-faststart: Fix unintended sign extension of atom_size
Fixes CID733810
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 2 Jun 2013 20:52:23 +0000 (22:52 +0200)]
tools/ffhash: close file handle on error
Fixes CID1026768
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 2 Jun 2013 20:48:03 +0000 (22:48 +0200)]
tools/ffeval: Check return value of av_expr_parse_and_eval()
Fixes CID1026745
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Kostya Shishkov [Sat, 1 Jun 2013 17:24:26 +0000 (19:24 +0200)]
vmd: decode videos with no LZ buffer size provided - they might not need it
The buffer is used for an additional pass of frame compression, so videos
can be coded without ever using it (and some are coded so indeed, e.g. in
Woodruff and the Schnibble of Azimuth game).
Kostya Shishkov [Sat, 1 Jun 2013 17:19:28 +0000 (19:19 +0200)]
vmd: fix mode 3 decoding
Michael Niedermayer [Sun, 2 Jun 2013 15:10:43 +0000 (17:10 +0200)]
avutil/sha: reorder Maj arguments
about 1% speedup
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Wed, 15 May 2013 22:28:17 +0000 (00:28 +0200)]
swscale: ppc: Remove commented-out define cruft
Diego Biurrun [Wed, 15 May 2013 22:28:03 +0000 (00:28 +0200)]
nsvdec: Remove commented-out debug cruft
Diego Biurrun [Sat, 1 Jun 2013 13:38:51 +0000 (15:38 +0200)]
cpu: Restructure code to avoid pointless ret variable indirection
libavutil/cpu.c:133:9: warning: unused variable ‘ret’ [-Wunused-variable]
Diego Biurrun [Sat, 1 Jun 2013 13:35:11 +0000 (15:35 +0200)]
tiff: K&R formatting cosmetics
Paul B Mahol [Mon, 27 May 2013 13:52:36 +0000 (13:52 +0000)]
tta encoder
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Mon, 27 May 2013 19:28:09 +0000 (19:28 +0000)]
tta: move code that will be shared with encoder to separate file
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Carl Eugen Hoyos [Sun, 2 Jun 2013 14:50:39 +0000 (16:50 +0200)]
Fix compilation of libavcodec/tiff.c
Paul B Mahol [Thu, 9 May 2013 19:39:32 +0000 (19:39 +0000)]
tiff: planar rgb
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sun, 2 Jun 2013 11:18:16 +0000 (13:18 +0200)]
avutil/sha512: Reshuffle Maj() operands
This reduces dependancy chains and improves speed by about 2%
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Thu, 30 May 2013 07:56:29 +0000 (04:56 -0300)]
lavu: Add SHA-2 512 hashing
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 2 Jun 2013 09:22:40 +0000 (11:22 +0200)]
use Kostyas full name in copyrights
This fixes 2 files that where not part of the original change
See:
de421b208578386bfb4416c67c9922877e670049
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 2 Jun 2013 08:52:48 +0000 (10:52 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
network: factor out connect-listening code
Conflicts:
libavformat/network.h
libavformat/tcp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 2 Jun 2013 08:30:35 +0000 (10:30 +0200)]
Merge commit '
28306e6d620c109ddd672f7243adfbc2bbb3b18f '
* commit '
28306e6d620c109ddd672f7243adfbc2bbb3b18f ':
network: factor out bind-listening code
use my full first name instead of short one in copyrights
Conflicts:
libavformat/tcp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 1 Jun 2013 23:58:33 +0000 (01:58 +0200)]
fate: use TARGET_SAMPLES in mcdeint tests
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sat, 1 Jun 2013 23:06:04 +0000 (23:06 +0000)]
tta: use get_unary()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sat, 1 Jun 2013 21:46:56 +0000 (23:46 +0200)]
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: detect when the created overlay buffers are not valid for the wanted overlay height
ffplay: do not allow wider window than 16383
ffplay: use 0 frame delay if redisplaying an already displayed frame
ffplay: use more sane frame timer resetting logic
ffplay: only update pts if not redisplaying a frame
ffplay: fix compute_target_delay to better handle frames with long durations
ffplay: if playing only audio or video only, show the master clock diff in status line
ffplay: factorize clock functions
ffplay: decrease video picture queue size to 3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sat, 1 Jun 2013 20:30:00 +0000 (22:30 +0200)]
lavfi/mp: drop mcdeint wrapper
It was ported to a native libavfilter filter.
Stefano Sabatini [Tue, 28 May 2013 11:41:41 +0000 (13:41 +0200)]
tests: add mcdeint tests
Stefano Sabatini [Tue, 28 May 2013 11:40:39 +0000 (13:40 +0200)]
lavfi: port mcdeint filter from libmpcodecs
Stefano Sabatini [Thu, 30 May 2013 22:36:50 +0000 (00:36 +0200)]
lavfi/mp/mcdeint: avoid uninited data read
Do not read padding or out-of-buffer values when computing the output
value for a pixel close to the image buffer edge.
This avoids non visible artifacts which affected the output checksum.
See thread:
Subject: [FFmpeg-devel] [PATCH] lavfi/mp/mcdeint: avoid uninited data read
Date: Thu, 30 May 2013 18:57:14 +0200
Clément Bœsch [Sat, 1 Jun 2013 17:16:37 +0000 (19:16 +0200)]
lavc/avcodec: decodimg → decoding.
Carl Eugen Hoyos [Sat, 1 Jun 2013 16:34:51 +0000 (18:34 +0200)]
Fix libcdio-paranoia detection.
Fixes ticket #2614.
Luca Barbato [Fri, 31 May 2013 01:05:13 +0000 (03:05 +0200)]
network: factor out connect-listening code
Introduce ff_listen_connect, to be shared with the other
non-tcp network protocols.
Luca Barbato [Wed, 29 May 2013 23:08:51 +0000 (01:08 +0200)]
network: factor out bind-listening code
Introduce ff_listen_bind, to be shared with the other non-tcp
network protocols.
Clément Bœsch [Sat, 1 Jun 2013 13:08:00 +0000 (15:08 +0200)]
lavf/webvttdec: factorize identifier and settings side data code.
Matthew Heaney [Fri, 31 May 2013 23:27:32 +0000 (16:27 -0700)]
lavf/webvttdec: save cue id and settings as side data
Currently the WebVTT demuxer parses the cues but throws away
the cue id (the optional first line of the cue) and cue
settings (the optional rendering instructions that follow
the timestamp).
However, in order to write inband text tracks (to WebM
files), the entire cue payload from the WebVTT source must
be preserved.
This commit makes no change to the data part of the output
buffer packet (where the actual cue text is stored), but
does add the cue id and settings as a side data items, if
they're present in the cue. Existing code that cares only
about the data part of the packet can continue to ignore the
side data.
There are two new packet data type flags,
AV_PKT_DATA_WEBVTT_IDENTIFIER and
AV_PKT_DATA_WEBVTT_SETTINGS.
Clément Bœsch [Sat, 1 Jun 2013 12:07:24 +0000 (14:07 +0200)]
lavc/avpacket: fill padding area on side data split.
The padding data is assumed to be 0 in several places, notably in
subtitles. This problem was not detected with fate-sub-srt test because
the first element of the side data (x1) is 0 in the test, so the
trailing side data present in the packet wasn't read by the decoder. The
issue can be observed with a large enough x1.
It is also noted in FF_INPUT_BUFFER_PADDING_SIZE doxy that MPEG
bitstreams require that padding with 0, so it might fix other issues.
Michael Niedermayer [Sat, 1 Jun 2013 12:33:34 +0000 (14:33 +0200)]
jpeg2000: make sure s->numXtiles / s->numYtiles are reset when tile is deallocated
This keeps the structure fields more consistent after cleanup
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Xidorn Quan [Sat, 1 Jun 2013 11:37:04 +0000 (19:37 +0800)]
vda_h264_dec: remove check_format
Since this function cannot work anymore, this patch simply removes it.
Kostya Shishkov [Sat, 1 Jun 2013 08:38:56 +0000 (10:38 +0200)]
use my full first name instead of short one in copyrights
Marton Balint [Wed, 29 May 2013 21:21:14 +0000 (23:21 +0200)]
ffplay: detect when the created overlay buffers are not valid for the wanted overlay height
Fixes cases when the picture height was bigger than the maximum supported
overlay height...
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Wed, 29 May 2013 21:03:47 +0000 (23:03 +0200)]
ffplay: do not allow wider window than 16383
SDL surface pitch is 16bit, to avoid possible overflows, we limit the window
width to 16383. Fixes ticket #2428.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sat, 2 Feb 2013 11:37:29 +0000 (12:37 +0100)]
ffplay: use 0 frame delay if redisplaying an already displayed frame
With the previous patches this finally fixes ticket #1707.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sat, 2 Feb 2013 11:37:29 +0000 (12:37 +0100)]
ffplay: use more sane frame timer resetting logic
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sat, 25 May 2013 10:48:20 +0000 (12:48 +0200)]
ffplay: only update pts if not redisplaying a frame
Signed-off-by: Marton Balint <cus@passwd.hu>