aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* protect unistd.h with #if HAVE_UNISTD_H in code from recent ↵Michael Niedermayer2014-07-082-2/+9
| | | | | | | | av_bprint_fd_contents() patches Should fix build failure on MSVC Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swresample: misc. doxy improvementsTimothy Gu2014-07-081-19/+64
| | | | | Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* doc/Doxyfile: use 5 columns for alphabetical indexMichael Niedermayer2014-07-081-1/+1
| | | | | | | 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>
* Merge commit '1e9a93bfca2c2f43a07e01f2ef9fd5cbafe6c22d'Michael Niedermayer2014-07-072-2/+2
|\ | | | | | | | | | | | | | | | | | | * 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>
| * libfdk-aacdec: Decode the first AAC frame to reliably identify the bitstreamOmer Osman2014-07-072-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge commit 'a863c97e99bf30a88baa74f83bab9e3ab25984dc'Michael Niedermayer2014-07-070-0/+0
|\| | | | | | | | | | | | | | | * commit 'a863c97e99bf30a88baa74f83bab9e3ab25984dc': smoothstreamingenc: Fix a memory leak on errors See: a53c5d454ee608fd539e5c02ade3f246470d1cb2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * smoothstreamingenc: Fix a memory leak on errorsMichael Niedermayer2014-07-071-1/+2
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | avcodec/vmdvideo: remove unneeded includeMichael Niedermayer2014-07-071-1/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/segment: simplify localtime* useMichael Niedermayer2014-07-071-7/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/segment: Support cutting at clocktimeDeti fliegl2014-07-072-2/+45
| | | | | | | | | | Signed-off-by: Deti fliegl <fliegl@baycom.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avdevice/lavfi: allow non-mmappable files for graph_fileAndrey Utkin2014-07-071-16/+17
| | | | | | | | | | | | Use av_bprint_fd_contents() instead of av_file_map() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/bprint: Add av_bprint_fd_contents()Andrey Utkin2014-07-073-2/+26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '246f869590b8c7313d26e1c2ef56db01f6fd2503'Michael Niedermayer2014-07-073-217/+240
|\| | | | | | | | | | | | | | | | | | | * commit '246f869590b8c7313d26e1c2ef56db01f6fd2503': vmd: Split audio and video decoder Conflicts: libavcodec/vmdvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vmd: Split audio and video decoderNidhi Makhijani2014-07-073-219/+238
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | avcodec/cljrdec: remove unneeded includeMichael Niedermayer2014-07-071-1/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '3c650efb81aaa3b395ba4606ee68a47ee4efb57b'Michael Niedermayer2014-07-0716-240/+206
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * dsputil: Move draw_edges() to mpegvideoencdspDiego Biurrun2014-07-0612-195/+155
| |
* | Merge commit 'c166148409fe8f0dbccef2fe684286a40ba1e37d'Michael Niedermayer2014-07-0721-347/+498
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * dsputil: Move pix_sum, pix_norm1, shrink function pointers to mpegvideoencDiego Biurrun2014-07-0621-296/+444
| |
* | Merge commit '8d686ca59db14900ad5c12b547fb8a7afc8b0b94'Michael Niedermayer2014-07-0711-126/+247
|\| | | | | | | | | | | | | | | | | | | | | | | * 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>
| * dsputil: Split off *_8x8basis to a separate contextDiego Biurrun2014-07-0611-125/+245
| |
* | avcodec/mpegvideo_enc: fix b frame strategy 2Michael Niedermayer2014-07-071-6/+8
| | | | | | | | | | | | Fixes Ticket3757 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | transcoding: fix Doxygen file pathTimothy Gu2014-07-071-1/+1
| | | | | | | | | | Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpegvideo: small indent fix in vismv codeClément Bœsch2014-07-071-2/+2
| |
* | avcodec: make vismv option as flag typesClément Bœsch2014-07-071-1/+1
| | | | | | | | This allows for example -vismv pf+bf+bb instead of -vismv 7.
* | avcodec/roqvideodec: set JPEG output color rangeEric Lasota2014-07-071-0/+1
| | | | | | | | | | Signed-off-by: Eric Lasota <ejlasota@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'a7985cfd4c51b7fe2b870fc4ecd109707ee035d6'Michael Niedermayer2014-07-071-1/+1
|\| | | | | | | | | | | | | | | | | | | | | * commit 'a7985cfd4c51b7fe2b870fc4ecd109707ee035d6': audio_fifo: Split into a separate doxygen module Conflicts: libavutil/audio_fifo.h See: 689e02808d09bd0441ec199cb1a8953ac7c666f6 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * audio_fifo: Split into a separate doxygen moduleTimothy Gu2014-07-061-0/+4
| | | | | | | | | | Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'd69243d39b773b64614792487cd93f6ceb237b25'Michael Niedermayer2014-07-070-0/+0
|\| | | | | | | | | | | | | | | | | | | | | * commit 'd69243d39b773b64614792487cd93f6ceb237b25': samplefmt: Add doxygen categories Conflicts: libavutil/samplefmt.h See: b27555a3a05f8a39c58ac98561411555da3f4a6f Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * samplefmt: Add doxygen categoriesTimothy Gu2014-07-061-0/+25
| | | | | | | | | | | | | | Categorize the enum and functions as "audio-related". Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'd6902070c52151ec1e8154ce9b22283a1d0bc192'Michael Niedermayer2014-07-073-108/+137
|\| | | | | | | | | | | | | | | | | | | | | * commit 'd6902070c52151ec1e8154ce9b22283a1d0bc192': dsicin: Split audio and video decoder Conflicts: libavcodec/Makefile libavcodec/dsicinvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsicin: Split audio and video decoderNidhi Makhijani2014-07-063-111/+139
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '2fc85fe96e7e0e5fc433b98eacebf4d3511d2d58'Michael Niedermayer2014-07-063-67/+94
|\| | | | | | | | | | | | | | | | | | | * commit '2fc85fe96e7e0e5fc433b98eacebf4d3511d2d58': bmv: Split audio and video decoder Conflicts: libavcodec/bmvvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * bmv: Split audio and video decoderNidhi Makhijani2014-07-063-69/+96
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | avcodec/roqvideo: use JPEG color rangeEric Lasota2014-07-066-12/+12
| | | | | | | | | | | | | | Signed-off-by: ejlasota <ejlasota@gmail.com> Also update fate test checksums Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swresample: organize functions into doxy groupsTimothy Gu2014-07-061-1/+43
| | | | | | | | | | Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swresample: better doxy for configuration-returning functionsTimothy Gu2014-07-061-1/+10
| | | | | | | | | | Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swresample: improve Doxygen introductionTimothy Gu2014-07-061-3/+30
| | | | | | | | | | Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swresample: add SwrContext doxyTimothy Gu2014-07-061-0/+6
| | | | | | | | | | Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swresample: add SwrDitherType doxyTimothy Gu2014-07-061-0/+1
| | | | | | | | | | Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swresample: group all the option constants in a section in doxyTimothy Gu2014-07-061-0/+11
| | | | | | | | | | Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swresample: grammar/capitalization fixesTimothy Gu2014-07-061-3/+3
| | | | | | | | | | Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil: actually install hash.hTimothy Gu2014-07-061-0/+1
| | | | | | | | | | | | | | | | | | 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>
* | x86/svq1enc: use unaligned mov on SSE2James Almer2014-07-061-1/+1
| | | | | | | | | | | | | | Might fix fate failures on some systems Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'b0633f83f277c05bf1f617a99c7aedd2db8306e3'Michael Niedermayer2014-07-063-64/+88
|\| | | | | | | | | | | | | | | | | | | * commit 'b0633f83f277c05bf1f617a99c7aedd2db8306e3': paf: split audio and video decoder Conflicts: libavcodec/pafvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * paf: split audio and video decoderNidhi Makhijani2014-07-063-67/+87
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '373a6dda5422186bc057297342a9e559a564595e'Michael Niedermayer2014-07-063-74/+102
|\| | | | | | | | | | | | | | | | | | | | | * commit '373a6dda5422186bc057297342a9e559a564595e': cljr: split decoder and encoder Conflicts: libavcodec/Makefile libavcodec/cljrdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cljr: split decoder and encoderNidhi Makhijani2014-07-063-75/+101
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '02a7a5e330ec4373a761f63c292220a1de13b968'Michael Niedermayer2014-07-060-0/+0
|\| | | | | | | | | | | | | | | | | | | | | * commit '02a7a5e330ec4373a761f63c292220a1de13b968': vc1test: Check malloc call Conflicts: libavformat/vc1test.c See: a807c68253b02cce8b9fbc87d7857c31d531a1ee Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1test: Check malloc callNidhi Makhijani2014-07-061-0/+2
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>