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
2017-10-30Merge commit '970c76f32283bddf3a5afd24fe52db7a96186244'James Almer
* commit '970c76f32283bddf3a5afd24fe52db7a96186244': mlp_parser: Drop in-parser downmix functionality Merged-by: James Almer <jamrial@gmail.com>
2017-10-30Merge commit '94c54d97e7f4fe90570c323803f2bdf6246c1010'James Almer
* commit '94c54d97e7f4fe90570c323803f2bdf6246c1010': mlp: Factor out channel layout subset checks Merged-by: James Almer <jamrial@gmail.com>
2017-04-27mlp_parser: Drop in-parser downmix functionalityVittorio Giovara
request_channel_layout is a decoder option and it makes no sense to have it in a parser. This feature was needed in the past when the decoder was allowed to reuse the avctx from the demuxer. Nowadays the decoder receives only the parameters from it, already containing the real channel layout (and the correct request_channel_layout option). After initialization the decoder overwrites the channel layout with the downmixed one that is actually output, so there is no need to preserve this functionality in the parser. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2017-04-26mlp: Factor out channel layout subset checksVittorio Giovara
2016-12-19mlp: Convert to the new bitstream readerAlexandra Hájková
2016-06-21Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'Clément Bœsch
* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb': cosmetics: Fix spelling mistakes Merged-by: Clément Bœsch <u@pkh.me>
2016-05-04cosmetics: Fix spelling mistakesVittorio Giovara
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2015-03-11mlpdec: support major sync headers with optional extension blocksHendrik Leppkes
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-09-21mlpdec: support major sync headers with optional extension blocksHendrik Leppkes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-06Merge commit '4b7f1a7ced0e98f2cc698d896f7ebab8d30eaa09'Michael Niedermayer
* commit '4b7f1a7ced0e98f2cc698d896f7ebab8d30eaa09': mlp: Parse TrueHD decoder channel modifiers and set the AVMatrixEncoding for each substream. Conflicts: libavcodec/mlp_parser.h libavcodec/mlpdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-05mlp: Parse TrueHD decoder channel modifiers and set the AVMatrixEncoding for ↵Tim Walker
each substream.
2013-01-23mlp: fix channel order.Michael Niedermayer
This fixes a regression introduced with todays merge Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23Merge commit '0ee8293a77a6afad161e91ce1d43c4a57ce33a6a'Michael Niedermayer
* commit '0ee8293a77a6afad161e91ce1d43c4a57ce33a6a': vp3dsp: don't do aligned reads on input. mlp_parser: cosmetics: re-indent. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23Merge commit '99ccd2ba10eac2b282c272ad9e75f082123c765a'Michael Niedermayer
* commit '99ccd2ba10eac2b282c272ad9e75f082123c765a': mlp: store the channel layout for each substream. Conflicts: libavcodec/mlp_parser.c libavcodec/mlpdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23mlp: store the channel layout for each substream.Tim Walker
Also stop storing the channel arrangement in the header info, as it's unused outside of ff_mlp_read_major_sync. Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com> CC:libav-stable@libav.org
2013-01-23mlp_parser: cosmetics: re-indent.Tim Walker
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
2012-01-29Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: aacenc: Fix LONG_START windowing. aacenc: Fix a bug where deinterleaved samples were stored in the wrong place. avplay: use the correct array size for stride. lavc: extend doxy for avcodec_alloc_context3(). APIchanges: mention avcodec_alloc_context()/2/3 avcodec_align_dimensions2: set only 4 linesizes, not AV_NUM_DATA_POINTERS. aacsbr: ARM NEON optimised sbrdsp functions aacsbr: align some arrays aacsbr: move some simdable loops to function pointers cosmetics: Remove extra newlines at EOF Conflicts: libavcodec/utils.c libavfilter/formats.c libavutil/mem.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-28cosmetics: Remove extra newlines at EOFAlex Converse
2011-11-26Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: swscale: Readd #define _SVID_SOURCE Fix av_get_channel_layout_string() for positions >31 configure: Store vda lib flags in extralibs instead of ldflags Make channel layout masks unsigned dca: ARMv6 optimised decode_blockcode() nullenc: drop AVFMT_RAWPICTURE from the flags frame-mt: return consumed packet size in ff_thread_decode_frame aacdec: add more fate tests covering SBR and PS MK(BE)TAG: avoid undefined shifts Conflicts: configure libavcodec/arm/dca.h libavcodec/dca.c libavcodec/mlp_parser.c libavcodec/version.h libavfilter/asrc_anullsrc.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/defaults.c libavutil/audioconvert.c libavutil/avutil.h libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-19Make MLP/TrueHD channel layout functions visible to the decoder.Carl Eugen Hoyos
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-08-31Globally rename the header inclusion guard names.Stefano Sabatini
Consistently apply this rule: the guard name is obtained from the filename by stripping the leading "lib", converting '/' and '.' to '_' and uppercasing the resulting name. Guard names in the root directory have to be prefixed by "FFMPEG_". Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-05Add correct header #include to fix 'make checkheaders'.Diego Biurrun
Originally committed as revision 14078 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-01Make ff_mlp_read_major_sync() take a GetBitContext instead of buffers.Ramiro Polla
Originally committed as revision 14044 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-30Fix make checkheaders, #include <inttypes.h> was missing.Diego Biurrun
Originally committed as revision 11114 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-28MLP/TrueHD parserIan Caulfield
Patch by Ian Caulfield, ian D caulfield <at> gmail D com Thread: [PATCH] MLP/TrueHD decoder, 12 Oct 14:26 Originally committed as revision 11109 to svn://svn.ffmpeg.org/ffmpeg/trunk