]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Fri, 12 Oct 2012 23:47:31 +0000 (01:47 +0200)]
ffv1: avoid checking a double for equality
if 0.0 != 0.0 a out of array read would occur, equal checks
with floating point may behave in such odd ways, though
this is very unlikely in a real implementation of a compiler
Fixes: CID718936
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Oct 2012 23:32:50 +0000 (01:32 +0200)]
af_pan: fix memleak of arg
Fixes CID718988
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Oct 2012 23:08:08 +0000 (01:08 +0200)]
vf_fade: fix memleaks of args
Fixes: CID718989
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Oct 2012 22:30:42 +0000 (00:30 +0200)]
ffserver: prevent nb_streams from becoming too large
Fixes CID732249
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Oct 2012 22:10:23 +0000 (00:10 +0200)]
aacsbr: change order of operation to prevent out of array read
Fixes CID732250
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Georg Lippitsch [Fri, 12 Oct 2012 19:18:50 +0000 (21:18 +0200)]
Fix writing 12 bit DPX
The DPX encoder now writes 12 DPX that open correctly (tested with
ImageMagick), and also correspond to the 12 bit sample files at
http://samples.ffmpeg.org/image-samples/dpx_samples.zip
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Georg Lippitsch [Fri, 12 Oct 2012 19:18:49 +0000 (21:18 +0200)]
Fix DPX decoder
Rewrite the DPX decoder to work with provided sample DPXs at
http://samples.ffmpeg.org/image-samples/dpx_samples.zip
The decoder could only decode 8 and 10 bit without alpha correctly,
failing or even crashing at other flavors. This patch aims to fix
these issues, properly decoding all variants of DPX provided in the
referenced DPX sample zip. For 10 and 12 bit, the alpha channel
is ignored, but decoding is still possible.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Fri, 12 Oct 2012 21:12:03 +0000 (23:12 +0200)]
lavf/swf: transform the swf tags define in an enum.
Clément Bœsch [Thu, 11 Oct 2012 22:14:45 +0000 (00:14 +0200)]
lavf/swf: re-align after previous commit.
Clément Bœsch [Thu, 11 Oct 2012 22:13:49 +0000 (00:13 +0200)]
lavf/swf: define more tags.
Based on swf specs v10, page 271-273.
Clément Bœsch [Thu, 11 Oct 2012 21:59:54 +0000 (23:59 +0200)]
lavf/swfdec: return more meaningful error codes.
Michael Niedermayer [Fri, 12 Oct 2012 20:38:54 +0000 (22:38 +0200)]
mpeg4videodec: disable frame multithreading for GMC, its not implemented at all
This fixes race conditions in decoding MPEG-4 GMC files
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Fri, 12 Oct 2012 16:23:46 +0000 (18:23 +0200)]
lavf/swfdec: fix flushing with compressed swf.
We now only return in the middle of the refill in case of read error, so
inflate can be re-called if zlib needs an empty (z.avail_in=0) inflate
call for flushing.
Michael Niedermayer [Fri, 12 Oct 2012 18:08:08 +0000 (20:08 +0200)]
movenc: fix timescale for timecode track
regression since
b02493e476
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
rogerdpack [Thu, 11 Oct 2012 15:34:24 +0000 (09:34 -0600)]
add dshow maintainer
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Oct 2012 17:33:39 +0000 (19:33 +0200)]
motion_est: more complete SAB diamond size check
This makes no difference with the current #defines
Fixes CID732255
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Oct 2012 17:03:49 +0000 (19:03 +0200)]
caca: fix 10l typo
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Fri, 12 Oct 2012 16:57:04 +0000 (16:57 +0000)]
sws: do not use av_pix_fmt_descriptors directly
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 12 Oct 2012 15:56:34 +0000 (15:56 +0000)]
lavd: do not use av_pix_fmt_descriptors directly
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Fri, 12 Oct 2012 15:58:15 +0000 (17:58 +0200)]
exr: fix twin ;
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Heesuk Jung [Fri, 12 Oct 2012 04:47:22 +0000 (13:47 +0900)]
avidec: Use sample size in case incorrect timestamps for aac in AVI (Ticket #1755)
In some case for aac in AVI, avidec extracts wrong PTS value.
(www.ffmpeg.org/trac/ffmpeg/ticket/1755)
I found additional case(ss=4096) and add condition.
Problematic file link : https://docs.google.com/open?id=0B6r7ZfWFIypCOTdZQUtGVEdJUUE
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Fri, 12 Oct 2012 15:39:02 +0000 (15:39 +0000)]
imgutils: do not use av_pix_fmt_descriptors directly
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Bradshaw [Fri, 12 Oct 2012 01:48:44 +0000 (19:48 -0600)]
Parse DEFINESOUND tags in swf (fix ticket 1638)
Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Fri, 12 Oct 2012 15:13:42 +0000 (15:13 +0000)]
lavc: do not use av_pix_fmt_descriptors directly
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Fri, 12 Oct 2012 15:21:01 +0000 (17:21 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavu,lavd: do not use av_pix_fmt_descriptors directly.
Conflicts:
libavutil/imgutils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Oct 2012 15:04:58 +0000 (17:04 +0200)]
Merge commit '
59ee9f78b0cc4fb84ae606fa317d8102ad32a627 '
* commit '
59ee9f78b0cc4fb84ae606fa317d8102ad32a627 ':
lavfi: do not use av_pix_fmt_descriptors directly.
Conflicts:
libavfilter/buffersrc.c
libavfilter/drawutils.c
libavfilter/filtfmts.c
libavfilter/vf_ass.c
libavfilter/vf_boxblur.c
libavfilter/vf_drawtext.c
libavfilter/vf_lut.c
libavfilter/vf_pad.c
libavfilter/vf_scale.c
libavfilter/vf_showinfo.c
libavfilter/vf_transpose.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Oct 2012 14:48:26 +0000 (16:48 +0200)]
Merge commit '
50ba57e0ce63d9904269ea0728936a0c79f8bfb5 '
* commit '
50ba57e0ce63d9904269ea0728936a0c79f8bfb5 ':
lavc: do not use av_pix_fmt_descriptors directly.
Conflicts:
libavcodec/imgconvert.c
libavcodec/libopenjpegdec.c
libavcodec/libopenjpegenc.c
libavcodec/mpegvideo.c
libavcodec/rawdec.c
libavcodec/rawenc.c
libavcodec/tiffenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Fri, 12 Oct 2012 14:23:01 +0000 (14:23 +0000)]
yop: check return value of avformat_new_stream()
Fixes null pointer dereference, fixes CID703729.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Fri, 12 Oct 2012 13:52:55 +0000 (15:52 +0200)]
Merge commit '
9953ff3cd844eb5f6d8dfce98cad94b78a0fc7dc '
* commit '
9953ff3cd844eb5f6d8dfce98cad94b78a0fc7dc ':
mpegvideo: fix indentation
sws: do not use av_pix_fmt_descriptors directly.
Conflicts:
libavcodec/mpegvideo.c
libswscale/swscale_internal.h
libswscale/swscale_unscaled.c
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Oct 2012 13:16:53 +0000 (15:16 +0200)]
Merge commit '
b7f1010c8fce09096057528f7cd29589ea1ae7df '
* commit '
b7f1010c8fce09096057528f7cd29589ea1ae7df ':
tools: do not use av_pix_fmt_descriptors directly.
pixdesc: add functions for accessing pixel format descriptors.
build: add support for Tru64 (OSF/1)
md5: Allocate a normal private context for the opaque md5 context pointer
Conflicts:
cmdutils.c
doc/APIchanges
ffprobe.c
libavformat/md5enc.c
libavutil/version.h
tools/graph2dot.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Oct 2012 12:52:34 +0000 (14:52 +0200)]
Merge commit '
e002e3291e6dc7953f843abf56fc14f08f238b21 '
* commit '
e002e3291e6dc7953f843abf56fc14f08f238b21 ':
Use the new aes/md5/sha/tree allocation functions
avutil: Add functions for allocating opaque contexts for algorithms
svq3: fix pointer type warning
svq3: replace unsafe pointer casting with intreadwrite macros
parseutils-test: various cleanups
Conflicts:
doc/APIchanges
libavcodec/svq3.c
libavutil/parseutils.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Oct 2012 12:38:04 +0000 (14:38 +0200)]
Merge commit '
15ba7f6525c0f56f0c8e3e3e0c0c5129de054f41 '
* commit '
15ba7f6525c0f56f0c8e3e3e0c0c5129de054f41 ':
parseutils: fix const removal warning
prepare 9_beta1 release
Conflicts:
Changelog
RELEASE
libavutil/parseutils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Oct 2012 12:26:46 +0000 (14:26 +0200)]
Merge commit '
9734b8ba56d05e970c353dfd5baafa43fdb08024 '
* commit '
9734b8ba56d05e970c353dfd5baafa43fdb08024 ':
Move avutil tables only used in libavcodec to libavcodec.
Conflicts:
libavcodec/mathtables.c
libavutil/intmath.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Oct 2012 12:15:33 +0000 (14:15 +0200)]
Merge commit '
0a75d1da23b8659ec49391469bb592da12760077 '
* commit '
0a75d1da23b8659ec49391469bb592da12760077 ':
options_table: refs option is not snow-only
random_seed: Support using CryptGenRandom on windows
doc: update the faq entry about custom I/O
Conflicts:
doc/faq.texi
libavcodec/options_table.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Fri, 12 Oct 2012 11:53:07 +0000 (11:53 +0000)]
truemotion2: remove unreachable code
Fixes CID610345.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Anton Khirnov [Sat, 6 Oct 2012 11:29:37 +0000 (13:29 +0200)]
lavu,lavd: do not use av_pix_fmt_descriptors directly.
Anton Khirnov [Sat, 6 Oct 2012 11:29:37 +0000 (13:29 +0200)]
lavfi: do not use av_pix_fmt_descriptors directly.
Anton Khirnov [Sat, 6 Oct 2012 11:29:37 +0000 (13:29 +0200)]
lavc: do not use av_pix_fmt_descriptors directly.
Anton Khirnov [Sat, 6 Oct 2012 13:21:17 +0000 (15:21 +0200)]
mpegvideo: fix indentation
Anton Khirnov [Sat, 6 Oct 2012 11:29:37 +0000 (13:29 +0200)]
tools: do not use av_pix_fmt_descriptors directly.
Anton Khirnov [Sat, 6 Oct 2012 11:29:37 +0000 (13:29 +0200)]
sws: do not use av_pix_fmt_descriptors directly.
Anton Khirnov [Sat, 6 Oct 2012 10:36:38 +0000 (12:36 +0200)]
pixdesc: add functions for accessing pixel format descriptors.
Make av_pix_fmt_descriptors table static on next major bump.
Making the table public is dangerous, since the caller has no way to
know how large it actually is. It also prevents adding new fields to
AVPixFmtDescriptor without a major bump.
Paul B Mahol [Fri, 12 Oct 2012 09:18:58 +0000 (09:18 +0000)]
takdec: stop decoding in case of unknown bps
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 12 Oct 2012 08:51:47 +0000 (08:51 +0000)]
takdec: s/bits_per_coded_sample/bits_per_raw_sample
bits_per_coded_sample should be set from demuxer and
not from decoder.
Prior to this change value set from demuxer would get
overwritten in decoder.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Fri, 12 Oct 2012 02:19:38 +0000 (04:19 +0200)]
nellymoserenc: fix array element ordering
Fixes assertion failures in trellis encoder
Fixes valgrind warnings in trellis encoder
Fixes CID732257
Fixes CID732256
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Thu, 11 Oct 2012 11:33:38 +0000 (12:33 +0100)]
build: add support for Tru64 (OSF/1)
Signed-off-by: Mans Rullgard <mans@mansr.com>
Michael Niedermayer [Fri, 12 Oct 2012 00:26:50 +0000 (02:26 +0200)]
tscc2: fix out of array access
Fixes CID732260
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Oct 2012 00:06:51 +0000 (02:06 +0200)]
rtmpproto: fix out of array write
Fixes CID732263
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 23:44:35 +0000 (01:44 +0200)]
motion-test: zero dsp context
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 23:43:11 +0000 (01:43 +0200)]
dv: zero dsp before init, this fixes use of uninitialized dct_bits
Fixes CID732292
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 22:07:21 +0000 (00:07 +0200)]
lavc: Fix use of uninitialized field.
Fixes CID732297
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 21:57:08 +0000 (23:57 +0200)]
rtspdec:read_line: fix use of uninitialized byte
Fixes CID732301
Fixes CID723300
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 19:26:05 +0000 (21:26 +0200)]
sanm: fix off by 1 error in draw_glyph()
This fix changes nothing as nothing passed a so large value
Fixes CID733785
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 19:16:09 +0000 (21:16 +0200)]
update_initial_timestamps: increase pts_buffer size
Fixes CID733786
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Thu, 11 Oct 2012 12:27:25 +0000 (15:27 +0300)]
md5: Allocate a normal private context for the opaque md5 context pointer
This avoids having to overestimate the md5 context size, which
isn't known beforehand, allowing us to use the new allocate functions
instead.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 11 Oct 2012 12:10:45 +0000 (15:10 +0300)]
Use the new aes/md5/sha/tree allocation functions
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 11 Oct 2012 12:08:04 +0000 (15:08 +0300)]
avutil: Add functions for allocating opaque contexts for algorithms
The current API where the plain size is exposed is not of much
use - in most cases it is allocated dynamically anyway.
If allocated e.g. on the stack via an uint8_t array, there's no
guarantee that the struct's members are aligned properly (unless
the array is overallocated and the opaque pointer within it
manually aligned to some unspecified alignment).
Signed-off-by: Martin Storsjö <martin@martin.st>
Paul B Mahol [Thu, 11 Oct 2012 19:37:25 +0000 (19:37 +0000)]
bethsoftvid: check return value of av_packet_new_side_data()
Fixes null pointer dereference, fixes CID733777.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Mans Rullgard [Thu, 11 Oct 2012 16:39:47 +0000 (17:39 +0100)]
svq3: fix pointer type warning
Fixes:
libavcodec/svq3.c:661:9: warning: passing argument 2 of 'svq3_decode_block' from incompatible pointer type
libavcodec/svq3.c:208:19: note: expected 'DCTELEM *' but argument is of type 'DCTELEM (*)[32]'
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Thu, 11 Oct 2012 15:08:22 +0000 (16:08 +0100)]
svq3: replace unsafe pointer casting with intreadwrite macros
Signed-off-by: Mans Rullgard <mans@mansr.com>
Paul B Mahol [Thu, 11 Oct 2012 17:56:04 +0000 (17:56 +0000)]
bmp: unbreak non BMP_RGB compression for v4 and v5
Fixes CID733728 & CID733729.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Mans Rullgard [Thu, 11 Oct 2012 13:12:34 +0000 (14:12 +0100)]
parseutils: fix const removal warning
The const qualifier is still removed although it happens inside
the strtol() function so no warning is generated.
Fixes:
libavutil/parseutils.c:110:11: warning: assignment discards qualifiers from pointer target type
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Thu, 11 Oct 2012 13:15:10 +0000 (14:15 +0100)]
parseutils-test: various cleanups
- make tables static const
- remove useless use of compound literal
- break long lines
- fix a comma/semicolon typo
Signed-off-by: Mans Rullgard <mans@mansr.com>
Clément Bœsch [Thu, 11 Oct 2012 16:41:07 +0000 (18:41 +0200)]
lavfi/ebur128: fix typo in condition.
Fixes CID733727.
Janne Grunau [Wed, 10 Oct 2012 21:40:04 +0000 (23:40 +0200)]
prepare 9_beta1 release
Diego Biurrun [Wed, 10 Oct 2012 23:16:05 +0000 (01:16 +0200)]
Move avutil tables only used in libavcodec to libavcodec.
Michael Niedermayer [Thu, 11 Oct 2012 16:27:06 +0000 (18:27 +0200)]
random_seed: fix digest size
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 16:27:21 +0000 (18:27 +0200)]
random_seed: fix out of array read
Fixes CID733787
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Mon, 8 Oct 2012 11:04:39 +0000 (13:04 +0200)]
options_table: refs option is not snow-only
Michael Niedermayer [Thu, 11 Oct 2012 16:13:13 +0000 (18:13 +0200)]
yuv2rgb: fix declared array sizes, so they match actuals.
Fixes CID733789, and others
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Thu, 11 Oct 2012 11:30:23 +0000 (14:30 +0300)]
random_seed: Support using CryptGenRandom on windows
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Thu, 11 Oct 2012 15:45:36 +0000 (17:45 +0200)]
jpeglsenc: favor av_freep() for saftey over av_free() when a variable is still accessible afterwards
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 15:44:58 +0000 (17:44 +0200)]
jpeglsnec: fix memleak of state in error case
Fixes CID733794
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 15:41:36 +0000 (17:41 +0200)]
libvpxenc: fix memleak on error path
Fixes CID733795
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 15:09:57 +0000 (17:09 +0200)]
av_tempfile: fix leak in error case
Fixes CID733796 Part2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 15:05:04 +0000 (17:05 +0200)]
libxvid_rc: fix leaks in ff_xvid_rate_control_init()
Fixes CID733796 Part1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 14:51:08 +0000 (16:51 +0200)]
tiff: fix leak on error return in doubles2str()
Fixes CID733797
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 14:48:25 +0000 (16:48 +0200)]
af_aresample: fix leak on alloc failure
Fixes CID733798
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 14:45:50 +0000 (16:45 +0200)]
drawtext: fix leak with timecodes
Fixes CID733799
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 13:54:37 +0000 (15:54 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mlpdsp: adding missing file
dsputil: split out mlp dsp function
sh4: add required #include, fix build
averror: make error values proper negative values
build: do not use LIB as variable name
build: whitespace cosmetics
build: remove single-use variable THIS_LIB
Conflicts:
libavutil/error.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 13:41:56 +0000 (15:41 +0200)]
Merge commit '
4436f25a1682ada3f7226cb6fadf429946933161 '
* commit '
4436f25a1682ada3f7226cb6fadf429946933161 ':
build: remove references to unused EXTRAOBJS variable
lavfi: convert input/ouput list compound literals to named objects
fate: add h263 obmc vsynth tests
avconv: remove bogus warning when using avconv -h without parameter
averror: explicitly define AVERROR_* values
flashsv: propagate inflateReset() errors
indeo4/5: remove constant parameter num_bands from wavelet recomposition
mxfdec: return error if no segments are available in mxf_get_sorted_table_segments
Double motion vector range for HPEL interlaced picture in proper place
Conflicts:
libavcodec/v210dec.h
libavfilter/af_aformat.c
libavfilter/af_amix.c
libavfilter/af_asyncts.c
libavfilter/af_channelmap.c
libavfilter/af_join.c
libavfilter/asrc_anullsrc.c
libavfilter/buffersrc.c
libavfilter/f_setpts.c
libavfilter/f_settb.c
libavfilter/fifo.c
libavfilter/src_movie.c
libavfilter/vf_ass.c
libavfilter/vf_blackframe.c
libavfilter/vf_boxblur.c
libavfilter/vf_delogo.c
libavfilter/vf_drawbox.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
libavfilter/vf_fieldorder.c
libavfilter/vf_fps.c
libavfilter/vf_hflip.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
libavfilter/vf_select.c
libavfilter/vf_transpose.c
libavfilter/vf_yadif.c
libavfilter/vsrc_testsrc.c
libavformat/mxfdec.c
libavutil/error.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Sun, 7 Oct 2012 21:19:29 +0000 (21:19 +0000)]
doc: update the faq entry about custom I/O
URLProtocols are private and custom AVIOContexts are a simple and
easier solution for most of the situations.
Michael Niedermayer [Thu, 11 Oct 2012 12:36:30 +0000 (14:36 +0200)]
Merge commit '
eb657ecefdeb8b2ed9bfb55d3c2c9e0f568486bf '
* commit '
eb657ecefdeb8b2ed9bfb55d3c2c9e0f568486bf ':
vc1dec: Set opposite to the correct value for 1REF field pictures
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 12:32:37 +0000 (14:32 +0200)]
Merge commit '
7cc3c4e1d4179aeabcd891090e31ee5e5bfd9692 '
* commit '
7cc3c4e1d4179aeabcd891090e31ee5e5bfd9692 ':
vc1dec: Invoke edge emulation regardless of MV precision for 1-MV chroma
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 12:28:18 +0000 (14:28 +0200)]
Merge commit '
88058d9a994f42e4e9ed4e67baf696bbfe53128c '
* commit '
88058d9a994f42e4e9ed4e67baf696bbfe53128c ':
vc1dec: Set chroma reference field from REFFIELD for 1REF field pictures
segment: support applehttp style list
Conflicts:
libavformat/segment.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 11:58:29 +0000 (13:58 +0200)]
Merge commit '
b522000e9b2ca36fe5b2751096b9a5f5ed8f87e6 '
* commit '
b522000e9b2ca36fe5b2751096b9a5f5ed8f87e6 ':
avio: introduce avio_closep
mpegtsenc: set muxing type notification to verbose
vc1dec: Use correct spelling of "opposite"
a64multienc: change mc_frame_counter to unsigned
arm: call arm-specific rv34dsp init functions under if (ARCH_ARM)
svq1: Drop a bunch of useless parentheses
parseutils-test: do not print numerical error codes
svq1: K&R formatting cosmetics
Conflicts:
doc/APIchanges
libavcodec/svq1dec.c
libavcodec/svq1enc.c
libavformat/version.h
libavutil/parseutils.c
tests/ref/fate/parseutils
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Thu, 11 Oct 2012 10:34:36 +0000 (12:34 +0200)]
mlpdsp: adding missing file
Luca Barbato [Thu, 11 Oct 2012 00:01:41 +0000 (02:01 +0200)]
dsputil: split out mlp dsp function
Mans Rullgard [Thu, 11 Oct 2012 01:08:24 +0000 (02:08 +0100)]
sh4: add required #include, fix build
Signed-off-by: Mans Rullgard <mans@mansr.com>
Stefano Sabatini [Thu, 11 Oct 2012 09:19:18 +0000 (11:19 +0200)]
Revert "configure: link flite against libasound"
This reverts commit
396648cc6a3eb5c00c698555fa4ddd631bf6664d .
The commit made impossible to build against libflite if libasound is not
available (e.g. on Windows). Thus remove the -lasound flag. In case of
libflite static linking the workaround is to enable
--extra-ldflags=-lasound (or disable the ALSA output device in libflite).
Stefano Sabatini [Fri, 5 Oct 2012 21:29:11 +0000 (23:29 +0200)]
configure: link flite against libasound
libflite depends on libasound. Fix a linking failure when linking against
a static version of libflite.
Reported-by: Vladimir Kraljevic
Paul B Mahol [Wed, 10 Oct 2012 16:31:51 +0000 (16:31 +0000)]
pcx: convert to bytestream2 API
Protects against overreads in input buffer.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Thu, 11 Oct 2012 02:42:52 +0000 (04:42 +0200)]
av_opt_set_from_string: fix memleak
Fixes CID733801
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 02:36:23 +0000 (04:36 +0200)]
swri_resample_init: unsupported sample formats are an internal error.
This condition cannot happen.
Fixes CID733802
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 02:00:16 +0000 (04:00 +0200)]
ffmpeg_opt: dont fail for sameq/same_quant.
Instead print a warning.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 01:33:34 +0000 (03:33 +0200)]
ffprobe: fix use of uninitialized pointer in av_strtok()
Fixes CID733837
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 01:12:40 +0000 (03:12 +0200)]
af_volumedetect: fix use of uninitilaized variable in case of planar audio.
Fixes: CID733841
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 01:00:34 +0000 (03:00 +0200)]
asrc_aevalsrc: Fix use of uninitialized pointer inside av_strtok()
Fixes CID733842
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 00:42:18 +0000 (02:42 +0200)]
sha: change loop condition to be tighter.
This makes no change to the way the code functions, but should make
it easier for static analyzers to see the valid range for i
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Oct 2012 00:16:52 +0000 (02:16 +0200)]
swscale-test: fix freeing of uninitialized variable
Fixes: CID733844
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>