Michael Niedermayer
53bf6b155c
Merge commit 'e3ec6fe7bb2a622a863e3912181717a659eb1bad'
...
* commit 'e3ec6fe7bb2a622a863e3912181717a659eb1bad':
rtsp: Add a buffer_size option
Conflicts:
libavformat/rtsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-01 21:34:20 +02:00
Michael Niedermayer
b99a8e4e4a
Merge commit '8c9c5479c4ba729b4ba868ab541a90b2061a7c2f'
...
* commit '8c9c5479c4ba729b4ba868ab541a90b2061a7c2f':
rtp: Add an option to set the send/receive buffer size
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-01 21:12:47 +02:00
Michael Niedermayer
fde2e35e56
Merge commit '3c47e7c4350f73fc77d8e76f0dd6d2946b13c5cc'
...
* commit '3c47e7c4350f73fc77d8e76f0dd6d2946b13c5cc':
rtp: Map the urloptions to AVOptions
Conflicts:
libavformat/rtpproto.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-01 21:03:10 +02:00
Michael Niedermayer
5dd5b7d531
Revert "avcodec/exr: fix memset first arg in reverse_lut()"
...
This reverts commit 586ba24ff2
.
Fixes Ticket 4386
Found-by: Martin Vignali <martin.vignali@gmail.com>
2015-04-01 19:53:23 +02:00
Himangi Saraogi
5b02e84bdb
lavc/smvjpegdec: Avoid null dereference and return meaningful error codes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-01 19:33:45 +02:00
Michael Niedermayer
b9fbd034bf
avformat/xwma: Use ff_alloc_extradata()
...
This prevents the fields from potentially becoming inconsistent in case of errors
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-01 18:25:34 +02:00
Michael Niedermayer
5b911f1d5b
avformat/webmdashenc: use AVERROR(ENOMEM) for memory allocation failures
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-01 18:11:48 +02:00
Michael Niedermayer
5b32558fd8
tools/sidxindex: Use av_*malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-01 17:43:25 +02:00
Michael Niedermayer
c49e7924a8
avutil/eval: check for av_malloc failure
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-01 15:59:58 +02:00
Michael Niedermayer
61123634dd
avutil/eval: factor av_expr_free() calls out
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-01 15:59:58 +02:00
Luca Barbato
e3ec6fe7bb
rtsp: Add a buffer_size option
...
And forward it to rtp and udp.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-04-01 14:26:35 +02:00
Luca Barbato
8c9c5479c4
rtp: Add an option to set the send/receive buffer size
...
It gets forwarded down to UDP.
2015-04-01 14:26:35 +02:00
Luca Barbato
3c47e7c435
rtp: Map the urloptions to AVOptions
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-04-01 14:26:35 +02:00
Timo Rothenpieler
b63c9a9990
avcodec/nvenc: Fix typoed nv_status checks
...
Thanks to Wyatt Aaron for pointing this out
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-01 11:55:26 +02:00
Donny Yang
3c912391dd
avcodec/png: Clearly separate encoding header and frames
...
Signed-off-by: Donny Yang <work@kota.moe>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-01 01:04:40 +02:00
Lukasz Marek
31886968d3
lavu/avstring: add av_append_path_component() funcion
...
Convinient function to build paths.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-31 23:50:46 +02:00
wm4
8b76c0eb56
avformat/mp3dec: offset seek index to end of id3v2 tag
...
The Xing index won't account for the id3 tag - it's relative to the
headers.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-31 23:22:07 +02:00
Michael Niedermayer
2ddedfd39c
avcodec/libx265: export choosen picture types
...
Fixes part of ticket 4285
Reviewed-by Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-31 20:21:10 +02:00
Donny Yang
749fbfd081
png: Clear up the calculation of max packet size
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-31 16:15:36 +02:00
Michael Niedermayer
65a646eb0b
avcodec/internal: Fix doxy for ff_alloc_packet2() return value
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-31 16:14:22 +02:00
Marton Balint
c84b75c89c
vf_drawtext: add support for setting box border width
...
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-31 13:41:25 +02:00
Himangi Saraogi
919d13d238
avformat/http: Fix null check on allocated value
...
probably fixes CID 1292299
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-31 12:38:02 +02:00
Rainer Hochecker
8b152c355f
h264: avoid unnecessary calls to get_format
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-31 12:14:39 +02:00
Himangi Saraogi
0c9abf2119
avfilter/vf_detelecine: Fix uninitialized array index error
...
Fixes the defect CID 1292301
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-31 12:11:17 +02:00
Rodger Combs
5cba5291a7
lavf/segment: style nits
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-31 04:34:32 +02:00
Michael Niedermayer
385fe984fc
avcodec/snowenc: Check av_frame_ref() return value
...
Fixes CID1026740
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-31 04:33:50 +02:00
Michael Niedermayer
a38758a97e
avcodec/h264_refs: fix null pointer dereference with -DTRACE
...
Found-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-31 01:57:00 +02:00
Michael Niedermayer
a105931d3e
Merge commit '4978850ca2cb1ec6908f5bc79cc592ca454d11e8'
...
* commit '4978850ca2cb1ec6908f5bc79cc592ca454d11e8':
build: Split JPEG-related tables off into a separate component
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-31 01:11:02 +02:00
Michael Niedermayer
48183f144d
Merge commit '87f87ccf32055aca25fa08e29e22cca1ba9976d5'
...
* commit '87f87ccf32055aca25fa08e29e22cca1ba9976d5':
mjpeg: Use a more precise type for put_marker()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-31 00:48:04 +02:00
Michael Niedermayer
21ee6da70c
avutil/hmac: Check av_hmac_alloc() return code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-30 23:24:33 +02:00
Michael Niedermayer
1a10134e20
swresample/swresample: Use av_mallocz_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-30 23:24:33 +02:00
Mariusz Szczepańczyk
f613f238f9
lavf: Bump minor version and document directory listing API in doc/APIchanges.
2015-03-30 23:02:53 +02:00
Michael Niedermayer
fda8b7ec7d
avcodec/libdcadec: remove av_assert and check bits_per_sample more completely
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-30 22:32:47 +02:00
Michael Niedermayer
1019a1cb0a
avfilter/vf_vignette: Change enum to int, which is accessed via AVOption as int
...
This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-30 21:58:42 +02:00
Michael Niedermayer
63167a6ba3
avdevice/avfoundation: Fix occured typo
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-30 21:41:17 +02:00
Michael Niedermayer
794e9fb5a6
Merge commit 'e6e3dcba0c6f11bd7022e2d3b9bcb7b6a09d6c80'
...
* commit 'e6e3dcba0c6f11bd7022e2d3b9bcb7b6a09d6c80':
mjpeg: Move code only used in the encoder(s) to the appropriate header
Conflicts:
libavcodec/mjpegdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-30 21:05:23 +02:00
Michael Niedermayer
847c0d333b
Merge commit '6ed38b1f65b424a4fa92042e0069f350b95e0098'
...
* commit '6ed38b1f65b424a4fa92042e0069f350b95e0098':
tiff: Return more meaningful error codes
Conflicts:
libavcodec/tiffenc.c
See: 0187c2ccda
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-30 20:55:52 +02:00
Michael Niedermayer
98263d7515
Merge commit '23944d29a22a2cd602753b3705f73011c3bf0b18'
...
* commit '23944d29a22a2cd602753b3705f73011c3bf0b18':
indeo: Give Indeo4/5 shared code a more consistent name
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-30 20:39:08 +02:00
Michael Niedermayer
f5c7531ab1
Merge commit '7d3183d3a4e800ab7a7fa24f49968a1b1bcc0161'
...
* commit '7d3183d3a4e800ab7a7fa24f49968a1b1bcc0161':
qsv: Skip header compilation depending on what parts of qsv are enabled
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-30 20:31:50 +02:00
Himangi Saraogi
0187c2ccda
tiff: Return more meaningful error codes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-30 19:34:26 +02:00
Diego Biurrun
4978850ca2
build: Split JPEG-related tables off into a separate component
2015-03-30 17:51:21 +02:00
Diego Biurrun
87f87ccf32
mjpeg: Use a more precise type for put_marker()
2015-03-30 17:51:20 +02:00
Diego Biurrun
e6e3dcba0c
mjpeg: Move code only used in the encoder(s) to the appropriate header
2015-03-30 17:51:20 +02:00
Himangi Saraogi
6ed38b1f65
tiff: Return more meaningful error codes
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2015-03-30 17:51:20 +02:00
Diego Biurrun
23944d29a2
indeo: Give Indeo4/5 shared code a more consistent name
2015-03-30 17:49:05 +02:00
Diego Biurrun
7d3183d3a4
qsv: Skip header compilation depending on what parts of qsv are enabled
2015-03-30 17:41:48 +02:00
Tim Nicholson
ac9919b966
libavformat/mxfenc.c: Add 'Presentation Y offset' metadata
...
Previously unset, and some software mishandles files if it is absent
Signed-off-by: Tim Nicholson <tim.nicholson@bbc.co.uk>
Reviewed-by: tomas.hardin@codemill.se
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-30 15:03:41 +02:00
Michael Niedermayer
dadc43eee4
avutil/pca: Check for av_malloc* failures
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-30 04:37:42 +02:00
Michael Niedermayer
4a10811617
avformat/nutdec: Use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-30 04:32:58 +02:00
Michael Niedermayer
7c6b0436b6
avformat/img2: Change enum to int, which is accessed via AVOption as int
...
This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-30 00:08:57 +02:00