]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Tue, 8 Jul 2014 00:48:51 +0000 (02:48 +0200)]
avfilter/vf_drawtext: Add #if HAVE_UNISTD_H around #include <unistd.h>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 8 Jul 2014 00:48:51 +0000 (02:48 +0200)]
avdevice/oss_audio: Add #if HAVE_UNISTD_H around #include <unistd.h>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Mon, 7 Jul 2014 22:24:49 +0000 (15:24 -0700)]
doc: add doxygen target tag
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Mon, 7 Jul 2014 22:24:48 +0000 (15:24 -0700)]
doc: make doxygen program configurable
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Mon, 7 Jul 2014 22:24:47 +0000 (15:24 -0700)]
doc: add doxy-wrapper.sh to doc/doxygen/html dependencies
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 7 Jul 2014 23:55:47 +0000 (01:55 +0200)]
ffserver: add HAVE_UNISTD_H around #include <unistd.h>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 7 Jul 2014 23:55:47 +0000 (01:55 +0200)]
tools/yuvcmp: add HAVE_UNISTD_H around #include <unistd.h>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 7 Jul 2014 23:55:47 +0000 (01:55 +0200)]
avcodec/libxvid: add HAVE_UNISTD_H around #include <unistd.h>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 7 Jul 2014 23:45:43 +0000 (01:45 +0200)]
protect unistd.h with #if HAVE_UNISTD_H in code from recent av_bprint_fd_contents() patches
Should fix build failure on MSVC
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Mon, 7 Jul 2014 22:23:49 +0000 (15:23 -0700)]
swresample: misc. doxy improvements
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 7 Jul 2014 22:43:18 +0000 (00:43 +0200)]
doc/Doxyfile: use 5 columns for alphabetical index
This reverts a hunk from
671005558a295945f5d4cfd1abca6832af479c0b
Reduces diff to what we use on the server
Suggested-by: Timothy Gu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 7 Jul 2014 21:16:59 +0000 (23:16 +0200)]
Merge commit '
1e9a93bfca2c2f43a07e01f2ef9fd5cbafe6c22d '
* commit '
1e9a93bfca2c2f43a07e01f2ef9fd5cbafe6c22d ':
libfdk-aacdec: Decode the first AAC frame to reliably identify the bitstream
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 7 Jul 2014 21:04:11 +0000 (23:04 +0200)]
Merge commit '
a863c97e99bf30a88baa74f83bab9e3ab25984dc '
* commit '
a863c97e99bf30a88baa74f83bab9e3ab25984dc ':
smoothstreamingenc: Fix a memory leak on errors
See:
a53c5d454ee608fd539e5c02ade3f246470d1cb2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 7 Jul 2014 20:29:29 +0000 (22:29 +0200)]
avcodec/vmdvideo: remove unneeded include
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 7 Jul 2014 20:29:02 +0000 (22:29 +0200)]
avformat/segment: simplify localtime* use
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Deti fliegl [Mon, 7 Jul 2014 19:35:43 +0000 (21:35 +0200)]
avformat/segment: Support cutting at clocktime
Signed-off-by: Deti fliegl <fliegl@baycom.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andrey Utkin [Thu, 3 Jul 2014 11:37:09 +0000 (14:37 +0300)]
avdevice/lavfi: allow non-mmappable files for graph_file
Use av_bprint_fd_contents() instead of av_file_map()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andrey Utkin [Thu, 3 Jul 2014 11:37:08 +0000 (14:37 +0300)]
avutil/bprint: Add av_bprint_fd_contents()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Omer Osman [Mon, 7 Jul 2014 08:28:12 +0000 (10:28 +0200)]
libfdk-aacdec: Decode the first AAC frame to reliably identify the bitstream
For implicit signaling cases (as possible for Spectral Band Replication
and Parametric Stereo Tools), the decoder must decode the first frame to
correctly identify the stream configuration (as called from
avformat_find_stream_info). The mechanism for this is built-in and only
requires adding CODEC_CAP_CHANNEL_CONF to the libfdk-aacdec AVCodec
struct.
Signed-off-by: Omer Osman <omer.osman@iis.fraunhofer.de>
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Sun, 6 Jul 2014 03:02:38 +0000 (05:02 +0200)]
smoothstreamingenc: Fix a memory leak on errors
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Mon, 7 Jul 2014 16:01:16 +0000 (18:01 +0200)]
Merge commit '
246f869590b8c7313d26e1c2ef56db01f6fd2503 '
* commit '
246f869590b8c7313d26e1c2ef56db01f6fd2503 ':
vmd: Split audio and video decoder
Conflicts:
libavcodec/vmdvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Nidhi Makhijani [Mon, 7 Jul 2014 04:11:04 +0000 (09:41 +0530)]
vmd: Split audio and video decoder
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Mon, 7 Jul 2014 14:31:51 +0000 (16:31 +0200)]
avcodec/cljrdec: remove unneeded include
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 7 Jul 2014 13:54:17 +0000 (15:54 +0200)]
Merge commit '
3c650efb81aaa3b395ba4606ee68a47ee4efb57b '
* commit '
3c650efb81aaa3b395ba4606ee68a47ee4efb57b ':
dsputil: Move draw_edges() to mpegvideoencdsp
Conflicts:
libavcodec/mpegvideo_enc.c
libavcodec/x86/Makefile
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_x86.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 7 Jul 2014 13:27:11 +0000 (15:27 +0200)]
Merge commit '
c166148409fe8f0dbccef2fe684286a40ba1e37d '
* commit '
c166148409fe8f0dbccef2fe684286a40ba1e37d ':
dsputil: Move pix_sum, pix_norm1, shrink function pointers to mpegvideoenc
Conflicts:
libavcodec/dsputil.c
libavcodec/mpegvideo_enc.c
libavcodec/x86/dsputilenc.asm
libavcodec/x86/dsputilenc_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 7 Jul 2014 13:04:05 +0000 (15:04 +0200)]
Merge commit '
8d686ca59db14900ad5c12b547fb8a7afc8b0b94 '
* commit '
8d686ca59db14900ad5c12b547fb8a7afc8b0b94 ':
dsputil: Split off *_8x8basis to a separate context
Conflicts:
libavcodec/dsputil.c
libavcodec/mpegvideo_enc.c
libavcodec/x86/dsputilenc_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 7 Jul 2014 12:51:41 +0000 (14:51 +0200)]
avcodec/mpegvideo_enc: fix b frame strategy 2
Fixes Ticket3757
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Mon, 7 Jul 2014 00:19:24 +0000 (17:19 -0700)]
transcoding: fix Doxygen file path
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Mon, 7 Jul 2014 09:26:15 +0000 (11:26 +0200)]
avcodec/mpegvideo: small indent fix in vismv code
Clément Bœsch [Mon, 7 Jul 2014 08:23:55 +0000 (10:23 +0200)]
avcodec: make vismv option as flag types
This allows for example -vismv pf+bf+bb instead of -vismv 7.
Eric Lasota [Sun, 6 Jul 2014 22:13:14 +0000 (18:13 -0400)]
avcodec/roqvideodec: set JPEG output color range
Signed-off-by: Eric Lasota <ejlasota@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 6 Jul 2014 22:55:36 +0000 (00:55 +0200)]
Merge commit '
a7985cfd4c51b7fe2b870fc4ecd109707ee035d6 '
* commit '
a7985cfd4c51b7fe2b870fc4ecd109707ee035d6 ':
audio_fifo: Split into a separate doxygen module
Conflicts:
libavutil/audio_fifo.h
See:
689e02808d09bd0441ec199cb1a8953ac7c666f6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 6 Jul 2014 22:32:29 +0000 (00:32 +0200)]
Merge commit '
d69243d39b773b64614792487cd93f6ceb237b25 '
* commit '
d69243d39b773b64614792487cd93f6ceb237b25 ':
samplefmt: Add doxygen categories
Conflicts:
libavutil/samplefmt.h
See:
b27555a3a05f8a39c58ac98561411555da3f4a6f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 6 Jul 2014 22:04:22 +0000 (00:04 +0200)]
Merge commit '
d6902070c52151ec1e8154ce9b22283a1d0bc192 '
* commit '
d6902070c52151ec1e8154ce9b22283a1d0bc192 ':
dsicin: Split audio and video decoder
Conflicts:
libavcodec/Makefile
libavcodec/dsicinvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Mon, 3 Feb 2014 19:13:59 +0000 (11:13 -0800)]
dsputil: Move draw_edges() to mpegvideoencdsp
Michael Niedermayer [Sun, 6 Jul 2014 21:43:37 +0000 (23:43 +0200)]
Merge commit '
2fc85fe96e7e0e5fc433b98eacebf4d3511d2d58 '
* commit '
2fc85fe96e7e0e5fc433b98eacebf4d3511d2d58 ':
bmv: Split audio and video decoder
Conflicts:
libavcodec/bmvvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Eric Lasota [Sun, 6 Jul 2014 19:42:43 +0000 (15:42 -0400)]
avcodec/roqvideo: use JPEG color range
Signed-off-by: ejlasota <ejlasota@gmail.com>
Also update fate test checksums
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Mon, 30 Dec 2013 18:56:07 +0000 (19:56 +0100)]
dsputil: Move pix_sum, pix_norm1, shrink function pointers to mpegvideoenc
Diego Biurrun [Mon, 30 Dec 2013 18:19:39 +0000 (19:19 +0100)]
dsputil: Split off *_8x8basis to a separate context
Timothy Gu [Sun, 6 Jul 2014 16:53:56 +0000 (09:53 -0700)]
swresample: organize functions into doxy groups
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Sun, 6 Jul 2014 16:53:54 +0000 (09:53 -0700)]
swresample: better doxy for configuration-returning functions
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Sun, 6 Jul 2014 16:53:55 +0000 (09:53 -0700)]
swresample: improve Doxygen introduction
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Sun, 6 Jul 2014 16:53:53 +0000 (09:53 -0700)]
swresample: add SwrContext doxy
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Sun, 6 Jul 2014 16:53:52 +0000 (09:53 -0700)]
swresample: add SwrDitherType doxy
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Sun, 6 Jul 2014 16:53:51 +0000 (09:53 -0700)]
swresample: group all the option constants in a section in doxy
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Sun, 6 Jul 2014 16:53:50 +0000 (09:53 -0700)]
swresample: grammar/capitalization fixes
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Sun, 6 Jul 2014 15:51:12 +0000 (08:51 -0700)]
avutil: actually install hash.h
This header is designed as a public header (with APIchanges entry and
everything), but it is forgotten to put into the headers to be installed
list.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Sun, 6 Jul 2014 17:54:17 +0000 (10:54 -0700)]
audio_fifo: Split into a separate doxygen module
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Timothy Gu [Sun, 6 Jul 2014 17:53:33 +0000 (10:53 -0700)]
samplefmt: Add doxygen categories
Categorize the enum and functions as "audio-related".
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
James Almer [Sun, 6 Jul 2014 16:14:32 +0000 (13:14 -0300)]
x86/svq1enc: use unaligned mov on SSE2
Might fix fate failures on some systems
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nidhi Makhijani [Sun, 6 Jul 2014 13:45:52 +0000 (19:15 +0530)]
dsicin: Split audio and video decoder
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Sun, 6 Jul 2014 18:11:40 +0000 (20:11 +0200)]
Merge commit '
b0633f83f277c05bf1f617a99c7aedd2db8306e3 '
* commit '
b0633f83f277c05bf1f617a99c7aedd2db8306e3 ':
paf: split audio and video decoder
Conflicts:
libavcodec/pafvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 6 Jul 2014 17:58:47 +0000 (19:58 +0200)]
Merge commit '
373a6dda5422186bc057297342a9e559a564595e '
* commit '
373a6dda5422186bc057297342a9e559a564595e ':
cljr: split decoder and encoder
Conflicts:
libavcodec/Makefile
libavcodec/cljrdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Nidhi Makhijani [Sun, 6 Jul 2014 14:03:49 +0000 (19:33 +0530)]
bmv: Split audio and video decoder
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Sun, 6 Jul 2014 17:42:33 +0000 (19:42 +0200)]
Merge commit '
02a7a5e330ec4373a761f63c292220a1de13b968 '
* commit '
02a7a5e330ec4373a761f63c292220a1de13b968 ':
vc1test: Check malloc call
Conflicts:
libavformat/vc1test.c
See:
a807c68253b02cce8b9fbc87d7857c31d531a1ee
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 6 Jul 2014 17:24:57 +0000 (19:24 +0200)]
Merge commit '
77fc7b76726719746ca45df6c4a62c41abad506e '
* commit '
77fc7b76726719746ca45df6c4a62c41abad506e ':
vc1test: Return proper error codes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 6 Jul 2014 17:12:52 +0000 (19:12 +0200)]
Merge commit '
865461099e062de5a3a109c2a5be98004c11d8bd '
* commit '
865461099e062de5a3a109c2a5be98004c11d8bd ':
librtmp: Don't free the temp url at the end of rtmp_open
Conflicts:
libavformat/librtmp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Nidhi Makhijani [Sun, 6 Jul 2014 04:42:50 +0000 (10:12 +0530)]
paf: split audio and video decoder
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Nidhi Makhijani [Sat, 5 Jul 2014 15:34:05 +0000 (21:04 +0530)]
cljr: split decoder and encoder
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Nidhi Makhijani [Sun, 6 Jul 2014 15:22:52 +0000 (20:52 +0530)]
vc1test: Check malloc call
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Nidhi Makhijani [Sat, 5 Jul 2014 18:58:56 +0000 (00:28 +0530)]
vc1test: Return proper error codes
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Martin Storsjö [Fri, 4 Jul 2014 19:13:39 +0000 (22:13 +0300)]
librtmp: Don't free the temp url at the end of rtmp_open
librtmp can keep pointers to this string internally, and may
use them at shutdown as well.
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Sun, 6 Jul 2014 12:35:13 +0000 (14:35 +0200)]
avfilter/vsrc_cellauto: Use av_mallocz_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 6 Jul 2014 12:34:37 +0000 (14:34 +0200)]
avfilter/vf_vignette: Use av_malloc_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 6 Jul 2014 12:33:54 +0000 (14:33 +0200)]
avfilter/unsharp_opencl: use av_mallocz_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 6 Jul 2014 03:02:38 +0000 (05:02 +0200)]
avformat/smoothstreamingenc: fix memleak
Fixes CID1224285
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Sun, 6 Jul 2014 01:08:34 +0000 (18:08 -0700)]
swresample: split option table to a separate file
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 6 Jul 2014 01:26:47 +0000 (03:26 +0200)]
avcodec/mjpegenc_common: Restore removed copyright statements
These where removed by libav while spliting the file in
adcb8392c9b185fd8a91a95fa256d15ab1432a30
See:
de6d9b6404bfd1c589799142da5a95428f146edd
See:
723106b279d9d78f5966f32bedfa33b88a702f69
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Fri, 4 Jul 2014 18:06:43 +0000 (11:06 -0700)]
avutil/audio_fifo: split into a separate doxy module
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 5 Jul 2014 22:14:23 +0000 (00:14 +0200)]
avcodec/Makefile: add libutvideo.h to SKIPHEADERS
libutvideo.h is not a C header and thus fails building as a C file
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Fri, 4 Jul 2014 18:06:41 +0000 (11:06 -0700)]
avutil/samplefmt: improve doxygen
Categorize the enum and funcs to "Audio related".
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Fri, 4 Jul 2014 18:06:40 +0000 (11:06 -0700)]
avcodec/old_codec_ids: workaround doxygen inclusion bug
Currently, http://ffmpeg.org/doxygen/trunk/group__preproc__misc.html is
broken, because of inclusion bug in Doxygen's preprocessing mode. The
now-unincluded header file is included anyway in avcodec.h, the only
place where it is used, so there should be no problem removing it.
One concern is API-compatibility, because old_codec_ids.h is a public
header. However, IMO this is not a problem because currently users
cannot include only this header and not `avcodec.h` anyway, because of
missing AV_CODEC_ID_NONE symbol.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sat, 5 Jul 2014 19:40:29 +0000 (16:40 -0300)]
x86/svq1enc: port ssd_int8_vs_int16 to yasm
Also add an SSE2 version
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 5 Jul 2014 18:12:31 +0000 (20:12 +0200)]
Merge commit '
b0de1c766329dd8c9960ad1722e2f653160abc1b '
* commit '
b0de1c766329dd8c9960ad1722e2f653160abc1b ':
x86: build: Only compile FDCT code if MMX is enabled
Conflicts:
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 5 Jul 2014 17:19:22 +0000 (19:19 +0200)]
Merge commit '
12f129e545e5a5844b6ad7f3eb6a438015cad8bc '
* commit '
12f129e545e5a5844b6ad7f3eb6a438015cad8bc ':
x86: Unconditionally compile blockdsp and svq1enc init files
Conflicts:
libavcodec/x86/Makefile
blockdsp_mmx is renamed to blockdsp_init as we already have a blockdsp file
and _init is how all other such files are called
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sat, 5 Jul 2014 17:35:31 +0000 (19:35 +0200)]
avfilter/haldclut: fix R/B swap in CLUT loading
Fixes Ticket #3751.
Michael Niedermayer [Sat, 5 Jul 2014 16:54:09 +0000 (18:54 +0200)]
Merge commit '
009331303a6462d07cbe94aef9c446f1a1695519 '
* commit '
009331303a6462d07cbe94aef9c446f1a1695519 ':
x86: huffyuvdsp: Move inline assembly to init file
Conflicts:
libavcodec/x86/Makefile
libavcodec/x86/huffyuvdsp.h
libavcodec/x86/huffyuvdsp_init.c
libavcodec/x86/huffyuvdsp_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Sat, 8 Feb 2014 10:11:14 +0000 (11:11 +0100)]
x86: build: Only compile FDCT code if MMX is enabled
All other files containing purely inline assembly are treated the same way.
Diego Biurrun [Thu, 3 Jul 2014 13:25:41 +0000 (06:25 -0700)]
x86: Unconditionally compile blockdsp and svq1enc init files
This avoids a link failure with MMX disabled as the init functions
are referenced unconditionally.
Diego Biurrun [Thu, 3 Jul 2014 13:20:53 +0000 (06:20 -0700)]
x86: huffyuvdsp: Move inline assembly to init file
This avoids a link failure with MMX disabled as now code and
initialization are compiled under the same condition.
Carl Eugen Hoyos [Sat, 5 Jul 2014 10:55:14 +0000 (12:55 +0200)]
Fix standalone compilation of the amv encoder.
Lukasz Marek [Fri, 4 Jul 2014 17:58:20 +0000 (19:58 +0200)]
doc/protocols: document unit of timeouts for ftp and http
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Stefano Sabatini [Fri, 4 Jul 2014 14:39:29 +0000 (16:39 +0200)]
tools/ffeval: print computed value even in case of error
This is useful for debugging purposes.
Stefano Sabatini [Thu, 3 Jul 2014 15:58:38 +0000 (17:58 +0200)]
lavfi/drawtext: do not allocate FT_Glyph, but keep it in the Glyph structure
Slightly simplify.
Michael Niedermayer [Sat, 5 Jul 2014 02:12:08 +0000 (04:12 +0200)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Use os/2 palette even if it contains less than 256 entries.
Assume that old bmps do not contain transparency information.
Do not detect jp2 images as mov files.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 5 Jul 2014 01:41:35 +0000 (03:41 +0200)]
Merge commit '
e0bfe34ea8ccf333ec5b17961fd58eb575e74f8b '
* commit '
e0bfe34ea8ccf333ec5b17961fd58eb575e74f8b ':
libfdk-aacdec: Reduce the default decoder delay by one frame
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Fri, 4 Jul 2014 19:23:53 +0000 (21:23 +0200)]
Use os/2 palette even if it contains less than 256 entries.
Fixes 11Bios13.bmp.
Carl Eugen Hoyos [Fri, 4 Jul 2014 19:14:53 +0000 (21:14 +0200)]
Assume that old bmps do not contain transparency information.
Fixes MK50TEMP.BMP that has its RGB channel bit masks on the actual image.
Carl Eugen Hoyos [Fri, 4 Jul 2014 19:13:40 +0000 (21:13 +0200)]
Do not detect jp2 images as mov files.
Omer Osman [Fri, 4 Jul 2014 09:05:44 +0000 (11:05 +0200)]
libfdk-aacdec: Reduce the default decoder delay by one frame
The default error concealment method if none is set via
aacDecoder_SetParam(AAC_CONCEAL_METHOD) is set in
CConcealment_InitCommonData within the fdk-aac library
and is set to Energy Interpolation. This method requires one frame
delay to the output. To reduce the default decoder output delay and
avoid missing the last frame in file based decoding, use Noise
Substitution as the default concealment method.
Signed-off-by: Omer Osman <omer.osman@iis.fraunhofer.de>
Signed-off-by: Martin Storsjö <martin@martin.st>
Timothy Gu [Fri, 4 Jul 2014 18:06:47 +0000 (11:06 -0700)]
Doxyfile: imitate gcc for better libavutil/attributes.h documentation
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Fri, 4 Jul 2014 18:06:45 +0000 (11:06 -0700)]
downmix_info: clarify doxygen
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Fri, 4 Jul 2014 18:06:44 +0000 (11:06 -0700)]
channel_layout: doxy: merge functions with macros
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Fri, 4 Jul 2014 18:06:46 +0000 (11:06 -0700)]
Doxyfile: enable browser-based search engine
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Fri, 4 Jul 2014 18:06:42 +0000 (11:06 -0700)]
avutil: fix version macros doxygen module
Without this patch, "Library Version Macros" module is not visible on
libavutil homepage in `make apidoc`.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Fri, 4 Jul 2014 17:50:13 +0000 (19:50 +0200)]
lavf/libssh: call ssh_userauth_none before ssh_userauth_list
According to doc, ssh_userauth_none must be called before ssh_userauth_list.
It solves login issue for new versions of libssh.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 4 Jul 2014 17:33:54 +0000 (19:33 +0200)]
avcodec/mlp_parser: check ff_combine_frame() return code
Fixes CID602338
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 4 Jul 2014 14:44:40 +0000 (16:44 +0200)]
avformat/img2dec: remove functions from image pipe which are unneeded for image pipes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 4 Jul 2014 12:37:01 +0000 (14:37 +0200)]
avcodec/bmp: fix integer overflow in checking header sizes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 4 Jul 2014 02:54:52 +0000 (04:54 +0200)]
avformat/img2dec: improve bmp probe
fix probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>