ffmpeg.git
5 years agoavcodec/mpegvideo_enc: fix b frame strategy 2
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>
5 years agotranscoding: fix Doxygen file path
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>
5 years agoavcodec/mpegvideo: small indent fix in vismv code
Clément Bœsch [Mon, 7 Jul 2014 09:26:15 +0000 (11:26 +0200)]
avcodec/mpegvideo: small indent fix in vismv code

5 years agoavcodec: make vismv option as flag types
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.

5 years agoavcodec/roqvideodec: set JPEG output color range
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>
5 years agoMerge commit 'a7985cfd4c51b7fe2b870fc4ecd109707ee035d6'
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>
5 years agoMerge commit 'd69243d39b773b64614792487cd93f6ceb237b25'
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>
5 years agoMerge commit 'd6902070c52151ec1e8154ce9b22283a1d0bc192'
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>
5 years agoMerge commit '2fc85fe96e7e0e5fc433b98eacebf4d3511d2d58'
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>
5 years agoavcodec/roqvideo: use JPEG color range
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>
5 years agoswresample: organize functions into doxy groups
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>
5 years agoswresample: better doxy for configuration-returning functions
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>
5 years agoswresample: improve Doxygen introduction
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>
5 years agoswresample: add SwrContext doxy
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>
5 years agoswresample: add SwrDitherType doxy
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>
5 years agoswresample: group all the option constants in a section in doxy
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>
5 years agoswresample: grammar/capitalization fixes
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>
5 years agoavutil: actually install hash.h
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>
5 years agoaudio_fifo: Split into a separate doxygen module
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>
5 years agosamplefmt: Add doxygen categories
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>
5 years agox86/svq1enc: use unaligned mov on SSE2
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>
5 years agodsicin: Split audio and video decoder
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>
5 years agoMerge commit 'b0633f83f277c05bf1f617a99c7aedd2db8306e3'
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>
5 years agoMerge commit '373a6dda5422186bc057297342a9e559a564595e'
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>
5 years agobmv: Split audio and video decoder
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>
5 years agoMerge commit '02a7a5e330ec4373a761f63c292220a1de13b968'
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>
5 years agoMerge commit '77fc7b76726719746ca45df6c4a62c41abad506e'
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>
5 years agoMerge commit '865461099e062de5a3a109c2a5be98004c11d8bd'
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>
5 years agopaf: split audio and video decoder
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>
5 years agocljr: split decoder and encoder
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>
5 years agovc1test: Check malloc call
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>
5 years agovc1test: Return proper error codes
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>
5 years agolibrtmp: Don't free the temp url at the end of rtmp_open
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>
5 years agoavfilter/vsrc_cellauto: Use av_mallocz_array()
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>
5 years agoavfilter/vf_vignette: Use av_malloc_array()
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>
5 years agoavfilter/unsharp_opencl: use av_mallocz_array()
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>
5 years agoavformat/smoothstreamingenc: fix memleak
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>
5 years agoswresample: split option table to a separate file
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>
5 years agoavcodec/mjpegenc_common: Restore removed copyright statements
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>
5 years agoavutil/audio_fifo: split into a separate doxy module
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>
5 years agoavcodec/Makefile: add libutvideo.h to SKIPHEADERS
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>
5 years agoavutil/samplefmt: improve doxygen
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>
5 years agoavcodec/old_codec_ids: workaround doxygen inclusion bug
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>
5 years agox86/svq1enc: port ssd_int8_vs_int16 to yasm
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>
5 years agoMerge commit 'b0de1c766329dd8c9960ad1722e2f653160abc1b'
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>
5 years agoMerge commit '12f129e545e5a5844b6ad7f3eb6a438015cad8bc'
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>
5 years agoavfilter/haldclut: fix R/B swap in CLUT loading
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.

5 years agoMerge commit '009331303a6462d07cbe94aef9c446f1a1695519'
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>
5 years agox86: build: Only compile FDCT code if MMX is enabled
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.

5 years agox86: Unconditionally compile blockdsp and svq1enc init files
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.

5 years agox86: huffyuvdsp: Move inline assembly to init file
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.

5 years agoFix standalone compilation of the amv encoder.
Carl Eugen Hoyos [Sat, 5 Jul 2014 10:55:14 +0000 (12:55 +0200)]
Fix standalone compilation of the amv encoder.

5 years agodoc/protocols: document unit of timeouts for ftp and http
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>
5 years agotools/ffeval: print computed value even in case of error
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.

5 years agolavfi/drawtext: do not allocate FT_Glyph, but keep it in the Glyph structure
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.

5 years agoMerge remote-tracking branch 'cehoyos/master'
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>
5 years agoMerge commit 'e0bfe34ea8ccf333ec5b17961fd58eb575e74f8b'
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>
5 years agoUse os/2 palette even if it contains less than 256 entries.
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.

5 years agoAssume that old bmps do not contain transparency information.
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.

5 years agoDo not detect jp2 images as mov files.
Carl Eugen Hoyos [Fri, 4 Jul 2014 19:13:40 +0000 (21:13 +0200)]
Do not detect jp2 images as mov files.

5 years agolibfdk-aacdec: Reduce the default decoder delay by one frame
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>
5 years agoDoxyfile: imitate gcc for better libavutil/attributes.h documentation
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>
5 years agodownmix_info: clarify doxygen
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>
5 years agochannel_layout: doxy: merge functions with macros
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>
5 years agoDoxyfile: enable browser-based search engine
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>
5 years agoavutil: fix version macros doxygen module
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>
5 years agolavf/libssh: call ssh_userauth_none before ssh_userauth_list
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>
5 years agoavcodec/mlp_parser: check ff_combine_frame() return code
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>
5 years agoavformat/img2dec: remove functions from image pipe which are unneeded for image pipes
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>
5 years agoavcodec/bmp: fix integer overflow in checking header sizes
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>
5 years agoavformat/img2dec: improve bmp probe
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>
5 years agoavformat/img2dec: increase probe buffer to 2k
Michael Niedermayer [Fri, 4 Jul 2014 02:54:32 +0000 (04:54 +0200)]
avformat/img2dec: increase probe buffer to 2k

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: update dependencies for vf_spp
Michael Niedermayer [Fri, 4 Jul 2014 02:47:13 +0000 (04:47 +0200)]
configure: update dependencies for vf_spp

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/img2dec: set AVProbeData size correctly on corner cases of tiny files
Michael Niedermayer [Fri, 4 Jul 2014 01:43:02 +0000 (03:43 +0200)]
avformat/img2dec: set AVProbeData size correctly on corner cases of tiny files

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/img2dec: avoid seekback on probeing
Michael Niedermayer [Fri, 4 Jul 2014 01:42:30 +0000 (03:42 +0200)]
avformat/img2dec: avoid seekback on probeing

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/img2dec: allocate and clear padding area for probe correctly
Michael Niedermayer [Fri, 4 Jul 2014 01:40:53 +0000 (03:40 +0200)]
avformat/img2dec: allocate and clear padding area for probe correctly

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'lukaszmluki/master'
Michael Niedermayer [Fri, 4 Jul 2014 00:19:04 +0000 (02:19 +0200)]
Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  lavf/ftp: always treat all response codes >= 500 as error
  lavf/ftp: explicitly enable UTF-8
  lavf/ftp: make response parsing more RFC compliant

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/swr: use lavu helper macros to check CPU extensions
James Almer [Thu, 3 Jul 2014 01:16:50 +0000 (22:16 -0300)]
x86/swr: use lavu helper macros to check CPU extensions

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoAutodetect JPEG2000 imagess.
Carl Eugen Hoyos [Fri, 4 Jul 2014 00:10:26 +0000 (02:10 +0200)]
Autodetect JPEG2000 imagess.

Autodetection of jp2 files does not work yet, the files are detected
as mov.

5 years agox86/swr: split audioconvert and rematrix DSP into separate files
James Almer [Thu, 3 Jul 2014 01:16:49 +0000 (22:16 -0300)]
x86/swr: split audioconvert and rematrix DSP into separate files

Also rename resample_x86_dsp.c to resample_init.c

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswr: initialize only the necessary resample dsp functions
James Almer [Thu, 3 Jul 2014 01:16:48 +0000 (22:16 -0300)]
swr: initialize only the necessary resample dsp functions

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/ftp: always treat all response codes >= 500 as error
Lukasz Marek [Thu, 3 Jul 2014 23:05:48 +0000 (01:05 +0200)]
lavf/ftp: always treat all response codes >= 500 as error

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavf/ftp: explicitly enable UTF-8
Lukasz Marek [Thu, 3 Jul 2014 22:32:16 +0000 (00:32 +0200)]
lavf/ftp: explicitly enable UTF-8

Most FTP servers enable UTF-8 by default, but it is not required by the standard.
Enabling it manually makes ffmpeg implementation more consistent when server
doesn't enable it by default.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavf/ftp: make response parsing more RFC compliant
Lukasz Marek [Thu, 3 Jul 2014 19:08:23 +0000 (21:08 +0200)]
lavf/ftp: make response parsing more RFC compliant

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agoMerge commit '391ecc961ced2bde7aecb3053ac35191f838fae8'
Michael Niedermayer [Thu, 3 Jul 2014 23:17:39 +0000 (01:17 +0200)]
Merge commit '391ecc961ced2bde7aecb3053ac35191f838fae8'

* commit '391ecc961ced2bde7aecb3053ac35191f838fae8':
  x86: mpegvideoenc: Change SIMD optimization name suffixes to lowercase

Conflicts:
libavcodec/x86/mpegvideoenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c6698dfe7cdbc7634f33245875488ed3fa4a8ced'
Michael Niedermayer [Thu, 3 Jul 2014 23:08:35 +0000 (01:08 +0200)]
Merge commit 'c6698dfe7cdbc7634f33245875488ed3fa4a8ced'

* commit 'c6698dfe7cdbc7634f33245875488ed3fa4a8ced':
  webpdec: Fix decoding of the huffman group indices.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9279826008b80daad7446950a821f32033ccd33f'
Michael Niedermayer [Thu, 3 Jul 2014 22:50:28 +0000 (00:50 +0200)]
Merge commit '9279826008b80daad7446950a821f32033ccd33f'

* commit '9279826008b80daad7446950a821f32033ccd33f':
  id3v2enc: use a case-insensitive comparison for APIC picture type

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dvdsubdec: fix alpha in debuging code
Oliver Fromme [Thu, 3 Jul 2014 14:12:12 +0000 (16:12 +0200)]
avcodec/dvdsubdec: fix alpha in debuging code

improve the debugging function for saving subtitles
to PPM files: Actually use the alpha channel.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dvdsubdec: Fix off-by-one error
Oliver Fromme [Thu, 3 Jul 2014 14:12:12 +0000 (16:12 +0200)]
avcodec/dvdsubdec: Fix off-by-one error

Fix an off-by-one error that causes the height of decoded
subtitles to be too small, thus cutting off the lowest row
of pixels.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86: mpegvideoenc: Change SIMD optimization name suffixes to lowercase
Diego Biurrun [Mon, 30 Dec 2013 16:06:45 +0000 (17:06 +0100)]
x86: mpegvideoenc: Change SIMD optimization name suffixes to lowercase

5 years agoMerge commit '0955e57ad07640574fc20ce0bea3c0b83982ada1'
Michael Niedermayer [Thu, 3 Jul 2014 19:42:16 +0000 (21:42 +0200)]
Merge commit '0955e57ad07640574fc20ce0bea3c0b83982ada1'

* commit '0955e57ad07640574fc20ce0bea3c0b83982ada1':
  daud: split muxer and demuxer

Conflicts:
libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agowebpdec: Fix decoding of the huffman group indices.
Justin Ruggles [Thu, 3 Jul 2014 15:28:17 +0000 (11:28 -0400)]
webpdec: Fix decoding of the huffman group indices.

Per the specification, "The red and green components of a pixel
define the meta Huffman code used in a particular block of the ARGB
image."

5 years agoMerge commit 'f920d089535bf7cf10aeda900cc43201c5e18cd0'
Michael Niedermayer [Thu, 3 Jul 2014 19:02:56 +0000 (21:02 +0200)]
Merge commit 'f920d089535bf7cf10aeda900cc43201c5e18cd0'

* commit 'f920d089535bf7cf10aeda900cc43201c5e18cd0':
  ismindex: Add an option for outputting files elsewhere than in the current directory

Conflicts:
tools/ismindex.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoid3v2enc: use a case-insensitive comparison for APIC picture type
Anton Khirnov [Wed, 2 Jul 2014 20:41:47 +0000 (22:41 +0200)]
id3v2enc: use a case-insensitive comparison for APIC picture type

5 years agoMerge commit '6bc4934b75dde9354ee16a6e700ebe6775abf69e'
Michael Niedermayer [Thu, 3 Jul 2014 18:37:00 +0000 (20:37 +0200)]
Merge commit '6bc4934b75dde9354ee16a6e700ebe6775abf69e'

* commit '6bc4934b75dde9354ee16a6e700ebe6775abf69e':
  ismindex: Allow adding a path prefix to the generated .ism file

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodaud: split muxer and demuxer
Nidhi Makhijani [Mon, 23 Jun 2014 04:03:50 +0000 (09:33 +0530)]
daud: split muxer and demuxer

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoismindex: Add an option for outputting files elsewhere than in the current directory
Martin Storsjö [Wed, 2 Jul 2014 20:02:58 +0000 (23:02 +0300)]
ismindex: Add an option for outputting files elsewhere than in the current directory

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoismindex: Allow adding a path prefix to the generated .ism file
Martin Storsjö [Wed, 2 Jul 2014 19:44:32 +0000 (22:44 +0300)]
ismindex: Allow adding a path prefix to the generated .ism file

This allows storing the .ismv/.isma/.ismc files separately from
the .ism file on a server, without having to manually edit the
.ism file after generating it with the ismindex tool.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoavformat: Add image3 demuxers with format autodetection
Carl Eugen Hoyos [Sat, 21 Jun 2014 19:43:19 +0000 (21:43 +0200)]
avformat: Add image3 demuxers with format autodetection

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoivfenc: support VP9
James Zern [Thu, 3 Jul 2014 03:28:39 +0000 (20:28 -0700)]
ivfenc: support VP9

libvpx tools accept vp9 ivf files

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>