Michael Niedermayer
1db2d39dfd
Merge commit '299d8ab104fb350254eb2e6d9ecdce892a2a55b1'
...
* commit '299d8ab104fb350254eb2e6d9ecdce892a2a55b1':
cook: Make sure there is enough extradata
See: c9e4554329
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
4fecf170d7
Merge commit '30b8eb0f87b0eaefdc115ef38f8ad87dd3a6e50b'
...
* commit '30b8eb0f87b0eaefdc115ef38f8ad87dd3a6e50b':
sol: simplify sol_codec_id()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
bcaef717ec
Merge commit 'b99ca863506f0630514921b740b78364de67a3ff'
...
* commit 'b99ca863506f0630514921b740b78364de67a3ff':
aacdec: avoid an out-of-bounds write
Conflicts:
libavcodec/aacdec.c
See: ba02069a8e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
932d8d790c
Merge commit '277ff7f5dc134f1c2dfc4ea0ef3540340482e3d2'
...
* commit '277ff7f5dc134f1c2dfc4ea0ef3540340482e3d2':
lavu: move internal define to the only places where it is used
Conflicts:
libavcodec/h264_cabac.c
libavutil/internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
010adacbe2
Merge commit '065923b0781b06a2604f69f4e2c2407b7750a854'
...
* commit '065923b0781b06a2604f69f4e2c2407b7750a854':
mpegenc: prevent a NULL pointer dereference
Not merged, this is not needed, and could hide more serious issues
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
ea41e6d637
Merge commit '9c12c6ff9539e926df0b2a2299e915ae71872600'
...
* commit '9c12c6ff9539e926df0b2a2299e915ae71872600':
motion_est: convert stride to ptrdiff_t
Conflicts:
libavcodec/me_cmp.c
libavcodec/ppc/me_cmp.c
libavcodec/x86/me_cmp_init.c
See: 9c669672c7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Martin Storsjö
fe42f94ce1
dashenc: Don't segment all video streams when one stream gets a keyframe
...
This makes sure that segments actually start at a keyframe (and
makes sure we don't split segments twice in a row, with one segment
consisting of only a handful of packets), when one stream uses b-frames
while another one doesn't.
Signed-off-by: Martin Storsjö <martin@martin.st>
10 years ago
Martin Storsjö
6f26f14f13
sidxindex: Write mimeType=audio/mp4 for audio-only representations
...
This fixes playback with dash.js, when the input is one separate
mp4 file per track.
Signed-off-by: Martin Storsjö <martin@martin.st>
10 years ago
Michael Niedermayer
b4d8724ab2
avutil/file: fix av_tempfile() documentation
...
Found-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Lukasz Marek
c9d39fc8c6
lavc/huffyuvdec: fix mem leak in case of init failure
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
10 years ago
Lukasz Marek
02cb7d4c9c
lavc/smvjpegdec: fix mem leak in case of init failure
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
10 years ago
Lukasz Marek
efe34e87eb
lavc/libxvid: fix mem leak in case of init failure
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
10 years ago
Vittorio Giovara
208f3abb91
aacsbr: always initialize max_qmf_subbands
...
Fixes a wordly warning from clang -Wsometimes-uninitialized.
10 years ago
Michael Niedermayer
55b59fab88
roqaudio: Always use the frame buffer on flush
...
Prevent NULL dereference.
CC: libav-stable@libav.org
Bug-Id: CID 703669
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
10 years ago
Vittorio Giovara
0562887a98
tiffenc: initialize return value
...
'ret' can only be used without initialization if s->height <= 0, which can
only happen if avctx->height <= 0, which is validated elsewhere. Doesn't hurt
to still initialize it though.
CC: libav-stable@libav.org
Bug-Id: CID 732296
10 years ago
Luca Barbato
299d8ab104
cook: Make sure there is enough extradata
...
At least 8 bytes are needed (Mono audio).
Bug-Id: CID 741418
CC: libav-stable@libav.org
10 years ago
Vittorio Giovara
30b8eb0f87
sol: simplify sol_codec_id()
...
Bug-Id: CID 1238993
10 years ago
Vittorio Giovara
b99ca86350
aacdec: avoid an out-of-bounds write
...
Also move the check in the case it is actually used.
CC: libav-stable@libav.org
Bug-Id: CID 1087090
10 years ago
Vittorio Giovara
277ff7f5dc
lavu: move internal define to the only places where it is used
10 years ago
Vittorio Giovara
065923b078
mpegenc: prevent a NULL pointer dereference
...
CC: libav-stable@libav.org
Bug-Id: CID 29261
10 years ago
Vittorio Giovara
9c12c6ff95
motion_est: convert stride to ptrdiff_t
...
CC: libav-stable@libav.org
Bug-Id: CID 700556 / CID 700557 / CID 700558
10 years ago
Michael Niedermayer
5182a2a235
avutil: remove FF_CONST_AVUTIL53, its no longer needed
...
version is 54 already
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
8294f5042d
Changelog: remove 24bit lossless wma entry for now, some samples work others do not yet work
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Jeffrey Wescott
60fd790f38
avformat/rtmpproto: only prepend @setMetaData for onMetaData and |RtmpSampleAccess
...
In current versions of ffmpeg, when streaming to an RTMP server, anytime a packet of type
RTMP_PT_NOTIFY is encountered, the packet is prepended with @setDataFrame before it gets sent
to the server. This is incorrect; only packets for onMetaData and |RtmpSampleAccess should
invoke @setDataFrame on the RTMP server. Specifically, the current bug manifests
itself when trying to stream onTextData or onCuePoint invocations.
This fix addresses that problem and ensures that the @setDataFrame is only prepended
for onMetaData and |RtmpSampleAccess.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Lukasz Marek
4e9745fbff
lavc/rv30: fix mem leak in case of init failure
...
Also replaced return -1 with return AVERROR(EINVAL)
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
10 years ago
Lukasz Marek
331fae80a1
lavc/mss1: fix mem leak in case of init failure
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
10 years ago
James Almer
305b03097d
lavf/apngdec: print currently unsupported in-stream tags in a more readable form
...
Also use length and not stream position
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: James Almer <jamrial@gmail.com>
10 years ago
Carl Eugen Hoyos
78093cf849
Print a warning if vp6 is muxed into flv: The output is flipped.
...
Fixes ticket #4132 .
10 years ago
Carl Eugen Hoyos
600e38f563
Fix standalone compilation of the apng decoder on x86.
10 years ago
Clément Bœsch
6e411d9cc7
avcodec/microdvddec: support non persistent italic marker '/'
...
Inspired from a patch by Michal Wazgird <mplayer@cyryl.net>
See https://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2014-November/072772.html
10 years ago
Clément Bœsch
8ef46f4a0c
avcodec/microdvddec: support various broken form of color tags
...
Inspired by a patch from Michal Wazgird <mplayer@cyryl.net>
See https://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2014-November/072772.html
10 years ago
Reimar Döffinger
cad3148ea3
xface: reduce stack usage by directly storing 2 bytes data instead of pointers.
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
10 years ago
Reimar Döffinger
dfc6f56c5a
xface: reduce table sizes.
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
10 years ago
Reimar Döffinger
6369a7b742
xface: Fix encoder crashes due to too small on-stack array.
...
Also add a FATE test.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
10 years ago
Reimar Döffinger
d0682b5eb0
svq1enc: reduce stack usage of recursively-called function.
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
10 years ago
Reimar Döffinger
458aadf862
lpc: Reduce stack usage by allocating LLSModel in context.
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
10 years ago
Lukasz Marek
f87a34486a
lavc/libvorbisdec: use better error codes
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
10 years ago
Lukasz Marek
bceabbdaba
lavc/libvorbisdec: fix mem leak in case of init failure
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
10 years ago
Lukasz Marek
969382162f
lavc/smacker: fix mem leak in case of init failure
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
10 years ago
Lukasz Marek
691f9be622
lavc/anm: fix mem leak in case of init failure
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
10 years ago
Michael Niedermayer
65ce8f8895
avcodec/x86/Makefile: fix order
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
9f0fd17c61
Merge commit 'f856d9c2f314c493c672dfb9c876da182525da3d'
...
* commit 'f856d9c2f314c493c672dfb9c876da182525da3d':
dashenc: Don't require the stream bitrate to be known
Conflicts:
libavformat/dashenc.c
See: 5f8fcdd448
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
6d8dda1693
Merge commit 'eec7f032a903e06d249d1e8aa6630b65292bf40f'
...
* commit 'eec7f032a903e06d249d1e8aa6630b65292bf40f':
lavf: Remove a redundant include of sys/stat.h
Conflicts:
libavformat/os_support.h
See: 49515cb840
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
d899ea2017
Merge commit '4b68edd08ac352e314ae3fc701f90b081e549324'
...
* commit '4b68edd08ac352e314ae3fc701f90b081e549324':
flvenc: Remove an unused variable
See: cc5f731541
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Matthew Oliver
293fee4bc2
libavcodec/tiff: Fix static linking of lzma with msvc.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Martin Storsjö
f856d9c2f3
dashenc: Don't require the stream bitrate to be known
...
Don't write any bitrate attribute if it isn't known. As long as one
doesn't want automatic bitrate switching, playback can work just
fine even if it isn't set.
If strict standard compliance is requested, this is still considered
an error, since the attribute is mandatory according to the spec.
Based on a patch by Rodger Combs.
Signed-off-by: Martin Storsjö <martin@martin.st>
10 years ago
Martin Storsjö
eec7f032a9
lavf: Remove a redundant include of sys/stat.h
...
The same file already includes this header a few lines further
above.
Signed-off-by: Martin Storsjö <martin@martin.st>
10 years ago
Michael Niedermayer
4b68edd08a
flvenc: Remove an unused variable
...
Signed-off-by: Martin Storsjö <martin@martin.st>
10 years ago
Michael Niedermayer
d3512a0e89
avcodec/x86/lossless_audiodsp: fix fallback code for 32bit
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
ce6141259b
avcodec/wmalosslessdec: support 24bit lossless
...
Not checked if its actually lossless
Fixes Ticket1847
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago