Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-02-14Merge commit '7f9f771eac0d37a632e0ed9bd89961d57fcfb7e0'Michael Niedermayer
* commit '7f9f771eac0d37a632e0ed9bd89961d57fcfb7e0': avcodec: Don't anonymously typedef structs Conflicts: libavcodec/alac.c libavcodec/cinepak.c libavcodec/cscd.c libavcodec/dcadec.c libavcodec/g723_1.c libavcodec/gif.c libavcodec/iff.c libavcodec/kgv1dec.c libavcodec/libopenjpegenc.c libavcodec/libspeexenc.c libavcodec/ra288.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-14avcodec: Don't anonymously typedef structsDiego Biurrun
2015-02-10avcodec/huffman: check if map was allocated tooPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2014-06-09avcodec/huffman/ff_huff_gen_len_table: support skiping stat=0 entriesMichael Niedermayer
This is probably not the simplest solution but as this is needed for a bugfix, simplification is left for later. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-20avcodec/huffman: use av_malloc_array()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-13avcodec/huffman: raise the input capability of ff_huff_gen_len_table() from ↵Michael Niedermayer
8 to 14bit Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-13avcodec/huffman: extend ff_huff_gen_len_table() to allow >8bitMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-24Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: Add missing #includes for *INT64_MAX and *INT64_C Conflicts: ffmpeg.c ffmpeg_filter.c ffplay.c libavformat/assdec.c libavformat/avidec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-24Add missing #includes for *INT64_MAX and *INT64_CDiego Biurrun
2013-09-28avcodec/huffman: Allow specifying nb_bits to ff_huff_build_tree()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-21avcodec/huffman: use named identifer for the bits constantMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-29Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112'Michael Niedermayer
* commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112': configure: support Bitrig OS yuv2rgb: handle line widths that are not a multiple of 4. graph2dot: Use the fallback getopt implementation if needed tools: Include io.h for open/read/write/close if unistd.h doesn't exist testprogs: Remove unused includes qt-faststart: Use other seek/tell functions on MSVC than on mingw ismindex: Include direct.h for _mkdir on windows sdp: Use static const char arrays instead of pointers to strings x86: avcodec: Drop silly "_mmx" suffixes from filenames x86: avcodec: Drop silly "_sse" suffixes from filenames sdp: Include profile-level-id for H264 utvideoenc: use ff_huff_gen_len_table huffman: add ff_huff_gen_len_table cllc: simplify/fix swapped data buffer allocation. rtpdec_h264: Don't set the pixel format h264: Check that the codec isn't null before accessing it audio_frame_queue: Define af_queue_log_state before using it Conflicts: libavcodec/audio_frame_queue.c libavcodec/h264.c libavcodec/huffman.h libavcodec/huffyuv.c libavcodec/utvideoenc.c libavcodec/x86/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-28huffman: add ff_huff_gen_len_tableMichael Niedermayer
The function will be used by utvideo as well. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2012-08-27Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: vf_hqdn3d: Don't declare the loop variable within the for loop huffyuv: update to current coding style huffman: update to current coding style rtsp: Free the rtpdec context properly build: fft: x86: Drop unused YASM-OBJS-FFT- variable Conflicts: libavcodec/huffman.c libavcodec/huffyuv.c libavcodec/x86/Makefile libavfilter/vf_hqdn3d.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-27huffman: update to current coding styleLuca Barbato
2012-08-22huffman/huffyuv: move lorens huffman table generation code to huffman.c/hMichael Niedermayer
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-16Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (27 commits) ppc: Add ff_ prefix to nonstatic symbols sh4: Add ff_ prefix to nonstatic symbols mpegvideo: Add ff_ prefix to nonstatic functions rtjpeg: Add ff_ prefix to nonstatic symbols rv: Add ff_ prefix to nonstatic symbols vp56: Add ff_ prefix to nonstatic symbols vorbis: Add ff_ prefix to nonstatic symbols msmpeg4: Add ff_ prefix to nonstatic symbols vc1: Add ff_ prefix to nonstatic symbols msmpeg4: Add ff_ prefixes to nonstatic symbols snow: Add ff_ prefix to nonstatic symbols mpeg12: Add ff_ prefix to nonstatic symbols mpeg4: Add ff_ prefixes to nonstatic symbols lagarith: Add ff_ prefix to lag_rac_init libavcodec: Add ff_ prefix to j_rev_dct* dsputil: Add ff_ prefix to inv_zigzag_direct16 libavcodec: Prefix fdct_ifast, fdct_ifast248 dsputil: Add ff_ prefix to the dsputil*_init* functions libavcodec: Add ff_ prefix to some nonstatic symbols vlc/rl: Add ff_ prefix to the nonstatic symbols ... Conflicts: libavcodec/Makefile libavcodec/allcodecs.c libavcodec/dnxhddec.c libavcodec/ffv1.c libavcodec/h263.h libavcodec/h263dec.c libavcodec/h264.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/nuv.c libavcodec/ppc/dsputil_ppc.c libavcodec/proresdsp.c libavcodec/svq3.c libavcodec/version.h libavformat/dv.h libavformat/dvenc.c libavformat/matroskadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-16vlc/rl: Add ff_ prefix to the nonstatic symbolsMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-01-30huffman: use a simple assignment instead of FFSWAP.Reimar Döffinger
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2012-01-30Deobfuscate ff_huff_build_tree.Reimar Döffinger
I have no idea what the idea was behind the original code, but the new code is equivalent to it. In that loop that places the new node nodes[j] contains always the data of the new node (since the steps are always in order: FFSWAP copies node[j] to node[j-1], j is decremented). Thus nodes[j].no == i and nodes[j].sym == HNODE. make fate still passes and contains VP6 samples which use FF_HUFFMAN_FLAG_HNODE_FIRST. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-07-15Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: configure: Automatically add more flags required on symbian mem.h: switch doxygen parameter order to match function prototype doxygen: replace @sa tag by the more readable but equivalent @see doxygen: use Doxygen markup for authors and web links where appropriate doxygen: do not include license boilerplate in Doxygen documentation ac3enc: Mark AVClasses const ffserver: Replace two loops with one loop. ffmpeg: Fix the check for experimental codecs swscale: extend mmx padding. swscale: clip unscaled colorspace conversion path. doxygen: misc consistency cosmetics doc: remove file name from @file directive in Doxygen usage example doxygen: consistently place brief description doxygen: place empty line between brief description and detailed description avformat_open_input(): Add braces to shut up gcc warning. Conflicts: libavcodec/8svx.c libavcodec/tiff.c libavcodec/tiff.h libavcodec/vaapi_h264.c libavcodec/vorbis.c libavcodec/vorbisdec.c libavcodec/vp6.c libswscale/swscale_unscaled.c libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-15doxygen: do not include license boilerplate in Doxygen documentationDiego Biurrun
2011-03-19Replace FFmpeg with Libav in licence headersMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2010-04-20Remove explicit filename from Doxygen @file commands.Diego Biurrun
Passing an explicit filename to this command is only necessary if the documentation in the @file block refers to a file different from the one the block resides in. Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-13Rename bitstream.h to get_bits.h.Stefano Sabatini
Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-01Use full internal pathname in doxygen @file directives.Diego Biurrun
Otherwise doxygen complains about ambiguous filenames when files exist under the same name in different subdirectories. Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-12avoid POSIX reserved _t suffixAurelien Jacobs
Originally committed as revision 16068 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-08huffman: add a zero_count flag and use it in frapsAurelien Jacobs
fixes issue349 Originally committed as revision 12374 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-08huffman: pass hnode_first as a flag instead of as an argument on its ownAurelien Jacobs
Originally committed as revision 12373 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-01Fix nodes[nb_codes*2-1].count being uninitialized and used to initializeReimar Döffinger
nodes[nb_codes*2-2].count (thus making that invalid as well) in ff_huff_build_tree. Might fix some (hard to reproduce) crashes in VP6 decoder. Originally committed as revision 11119 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-16Cygwin don't like this function declaration.Aurelien Jacobs
So move this self-documentation into a comment instead. Originally committed as revision 10743 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-15moves fraps huffman decoder to its own file, making it more genericAurelien Jacobs
Originally committed as revision 10736 to svn://svn.ffmpeg.org/ffmpeg/trunk