Michael Niedermayer
d5a645625d
Merge commit '4733a12dd17a91d606e0079ff9bb48b9f419cbef'
...
* commit '4733a12dd17a91d606e0079ff9bb48b9f419cbef':
rtpdec_asf: Check memory allocation and free memory on error
Conflicts:
libavformat/rtpdec_asf.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
3d6635749a
Merge commit '6308cd4868d2bd5fdf8bfa8dd10856c9a91874f5'
...
* commit '6308cd4868d2bd5fdf8bfa8dd10856c9a91874f5':
mov: Check memory allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
77510a9698
Merge commit 'bc1eace1b3654c490cb2c226b3c80854244dbb9a'
...
* commit 'bc1eace1b3654c490cb2c226b3c80854244dbb9a':
jack: Check memory allocation
Conflicts:
libavdevice/jack.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
d1f7b313ac
Merge commit 'f7e932473314e6ca4c851d49cbde8570b6e66383'
...
* commit 'f7e932473314e6ca4c851d49cbde8570b6e66383':
audiointerleave: Always initialize new_pkt
Conflicts:
libavformat/audiointerleave.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
01a6ae1396
Merge commit '8ef98855d25e457094468e2e1a79d9b10d6445b2'
...
* commit '8ef98855d25e457094468e2e1a79d9b10d6445b2':
sctp: Always initialize outmsg struct
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
402b18afcc
Merge commit 'caf7be30b11288c498fae67be4741bfbf083d977'
...
* commit 'caf7be30b11288c498fae67be4741bfbf083d977':
mpjpgdec: free AVIOContext leak on early probe fail
Conflicts:
libavformat/mpjpegdec.c
See: 34d278f983
, this was mistakenly reimplemented, also see ffmpeg IRC log of today
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
83e3516e64
Merge commit '925b80d64029d41962e5998d7d901226c3a9baea'
...
* commit '925b80d64029d41962e5998d7d901226c3a9baea':
mpegvideo: Move OutFormat enum to mpegutils.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
3244a17650
Merge commit '9bb11be0e5a75782c3139ad058c2b571499aa37d'
...
* commit '9bb11be0e5a75782c3139ad058c2b571499aa37d':
mpegvideo: Split picture allocation for encoding and decoding
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Andreas Cadhalpun
b18eac7ff2
vp9: change type of tile_size from unsigned to int64_t
...
Otherwise the check 'tile_size < size' treats a negative size as
unsigned, causing the check to pass. This subsequently leads to
segmentation faults.
This was originally fixed as part of Libav commit 72ca83, so the
original author is one of the following developers:
Anton Khirnov <anton@khirnov.net>
Diego Biurrun <diego@biurrun.de>
Luca Barbato <lu_zero@gentoo.org>
Martin Storsjö <martin@martin.st>
Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
10 years ago
Michael Niedermayer
e05fda99f7
Merge commit 'f8716a1408f4f4ec63857b7015fbd62f9eac344a'
...
* commit 'f8716a1408f4f4ec63857b7015fbd62f9eac344a':
mpegvideo: Rework frame_size_alloc function
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
db8ae37a78
Merge commit 'da0c8664b4dc906696803685f7e53ade68594ab8'
...
* commit 'da0c8664b4dc906696803685f7e53ade68594ab8':
mpegvideo: Move various temporary buffers to a separate context
Conflicts:
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_motion.c
libavcodec/rv34.c
libavcodec/vc1_mc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
James Almer
34d278f983
mpjpegdec: fix memory leak in probe function
...
Signed-off-by: James Almer <jamrial@gmail.com>
10 years ago
Michael Niedermayer
a4557b7a98
Merge commit 'a6f19d6a9f8d1e08653d9d77581e8c823f4955c2'
...
* commit 'a6f19d6a9f8d1e08653d9d77581e8c823f4955c2':
configure: Support MSVC 2015
Conflicts:
configure
libavutil/internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
56f0fe6b84
swr: Fix ASSERT_LEVEL warning
...
Found-by: cehoyos
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
653bf3c5a1
avcodec/hq_hqa: Fix signness of tag
...
Fixes Ticket4509
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Donny Yang
130a6c04a4
avcodec/apng: Add partial support for blending with PAL8 pixel format
...
Currently restricted to blending pixels that only contain either
0 or 255 in their alpha components
Signed-off-by: Donny Yang <work@kota.moe>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Donny Yang
33292c07fe
avcodec/apng: Add support for blending with GRAY8A pixel format
...
Signed-off-by: Donny Yang <work@kota.moe>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Donny Yang
0ab1c46fe0
avcodec/apng: Add blending support for non-alpha pixel formats
...
Signed-off-by: Donny Yang <work@kota.moe>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Donny Yang
ed09bb3782
avcodec/apng: Dispose previous frame properly
...
The spec specifies the dispose operation as how the current (i.e., currently
being rendered) frame should be disposed when the next frame is blended onto it
This is contrary to ffmpeg's current behaviour of interpreting the dispose
operation as how the previous (i.e., already rendered) frame should be disposed
This patch fixes ffmpeg's behaviour to match those of the spec, which involved
a rewrite of the blending function
Signed-off-by: Donny Yang <work@kota.moe>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Rodger Combs
6dd5371e34
lavf/tls: let the user specify what name to verify against
...
This can be useful for debugging, or in scenarios where the user
doesn't want to use the system's DNS settings for whatever reason.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Vittorio Giovara
4733a12dd1
rtpdec_asf: Check memory allocation and free memory on error
...
CC: libav-stable@libav.org
Bug-Id: CID 1257774
10 years ago
Vittorio Giovara
6308cd4868
mov: Check memory allocation
...
CC: libav-stable@libav.org
Bug-Id: CID 1292518
10 years ago
Vittorio Giovara
bc1eace1b3
jack: Check memory allocation
...
CC: libav-stable@libav.org
Bug-Id: CID 1292520
10 years ago
Vittorio Giovara
f7e9324733
audiointerleave: Always initialize new_pkt
...
CC: libav-stable@libav.org
Bug-Id: CID 609333
10 years ago
Vittorio Giovara
8ef98855d2
sctp: Always initialize outmsg struct
...
CC: libav-stable@libav.org
Bug-Id: CID 1302711
10 years ago
Janne Grunau
caf7be30b1
mpjpgdec: free AVIOContext leak on early probe fail
10 years ago
Vittorio Giovara
925b80d640
mpegvideo: Move OutFormat enum to mpegutils.h
...
It is necessary to avoid circular header dependencies.
10 years ago
Vittorio Giovara
9bb11be0e5
mpegvideo: Split picture allocation for encoding and decoding
...
The main ff_alloc_picture() function is made more generic with all the
parameters necessary as arguments. This will allows to move most of the
related functions to a separate file later.
Right now wrappers are provided to try and minimize the number of
changes in the code.
10 years ago
Vittorio Giovara
f8716a1408
mpegvideo: Rework frame_size_alloc function
...
Use more generic arguments and remove its static attribute since it will
be moved to a separate file.
10 years ago
Vittorio Giovara
da0c8664b4
mpegvideo: Move various temporary buffers to a separate context
10 years ago
Luca Barbato
a6f19d6a9f
configure: Support MSVC 2015
...
The C runtime C99 compatibility had been improved a lot and it now
rejects some of the compatibility defines provided for the older
versions.
Many thanks to Ray for the time spent testing.
Bug-Id: 864
CC: libav-stable@libav.org
10 years ago
Michael Niedermayer
7630cce4b3
avformat/mxfenc: Allow overriding /manual setting of the signal standard
...
previous patch reviewed-by: tim nicholson <nichot20@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Max Poliakovski
4b343f7c35
atrac3plus: give the phase_shift flag a better name.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Max Poliakovski
d765e07322
atrac3plus: add support for GHA phase inversion.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
ac2dad9690
avformat/version: Bump version for single jpeg muxer
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
5cf84e595d
doc/ffserver: Add entry for missing jpeg variant
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Caligula useraccount
3b89a67315
ffserver: Use singlejpeg muxer for jpeg
...
Fixes Ticket4218
Based on patch by: Otávio Ribeiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Caligula useraccount
51ac1f616f
avformat: Add single jpeg muxer
...
Needed to fix Ticket4218
Based on patch by: Otávio Ribeiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
990605768c
avcodec/aacdec: Do not return a uninitialized value
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
153d23ee39
Merge commit 'bc76c46943272515805d7ac48ca39f14826d1fed'
...
* commit 'bc76c46943272515805d7ac48ca39f14826d1fed':
aac: Wait to know the channels before allocating frame
Conflicts:
libavcodec/aacdec.c
See: 676a395ab9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
476692abdb
Merge commit 'a188108ebf28ebac9d2b8fc7d5b391aef45698b3'
...
* commit 'a188108ebf28ebac9d2b8fc7d5b391aef45698b3':
aac: Support channel configurations 11 and 12
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
8eb2c411c1
Merge commit '677c804aa3a78d61b21e6423165a252846c20f0e'
...
* commit '677c804aa3a78d61b21e6423165a252846c20f0e':
aac: correctly map 7.1ch-wide AAC from FDK AAC encoder
Sample: FDK_7.1ch_wide.aac
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
ce838ad950
Merge commit '252d6200c36e7eaa79f8d5205b7d731179e94897'
...
* commit '252d6200c36e7eaa79f8d5205b7d731179e94897':
avio: Add avio_put_str16be
Conflicts:
doc/APIchanges
libavformat/avio.h
libavformat/aviobuf.c
libavformat/version.h
The FFmpeg implementation is kept as requested by ubitux
Doxy improvements merged
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
8985e7c561
Merge commit '9b56ac74b170d12027fbc81f581a451a709f1105'
...
* commit '9b56ac74b170d12027fbc81f581a451a709f1105':
mpjpeg: Initial implementation
Conflicts:
Changelog
libavformat/allformats.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
7856afef52
avformat/hdsenc: Change duration from single to to double precision
...
This slightly improves precision
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
0dbea4642f
avformat/rmenc: Remove float usage
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
4c4c3d5d5a
avcodec/libstagefright: Check for pthread_create() failure
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Clément Bœsch
40cc3be73c
avfilter: fix a few 5 spaces indent
10 years ago
Michael Niedermayer
7c453277a3
avdevice/iec61883: Check pthread init for failures
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
ddda9cee1c
ffserver: Check for ffio_set_buf_size() failure
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago