summaryrefslogtreecommitdiffstats
path: root/libavcodec/mlp_parser.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '4b7f1a7ced0e98f2cc698d896f7ebab8d30eaa09'Michael Niedermayer2014-01-051-0/+5
|\ | | | | | | | | | | | | | | | | | | | | * 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>
| * mlp: Parse TrueHD decoder channel modifiers and set the AVMatrixEncoding for ↵Tim Walker2014-01-051-0/+4
| | | | | | | | each substream.
* | mlp: fix channel order.Michael Niedermayer2013-01-231-0/+1
| | | | | | | | | | | | This fixes a regression introduced with todays merge Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '0ee8293a77a6afad161e91ce1d43c4a57ce33a6a'Michael Niedermayer2013-01-231-10/+10
|\ \ | |/ | | | | | | | | | | | | * commit '0ee8293a77a6afad161e91ce1d43c4a57ce33a6a': vp3dsp: don't do aligned reads on input. mlp_parser: cosmetics: re-indent. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mlp_parser: cosmetics: re-indent.Tim Walker2013-01-221-10/+10
| | | | | | | | Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
* | Merge commit '99ccd2ba10eac2b282c272ad9e75f082123c765a'Michael Niedermayer2013-01-231-3/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | * 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>
| * mlp: store the channel layout for each substream.Tim Walker2013-01-221-3/+6
| | | | | | | | | | | | | | | | 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
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-291-1/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * cosmetics: Remove extra newlines at EOFAlex Converse2012-01-271-1/+0
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-261-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Make MLP/TrueHD channel layout functions visible to the decoder.Carl Eugen Hoyos2011-04-191-0/+3
|/
* Remove explicit filename from Doxygen @file commands.Diego Biurrun2010-04-201-1/+1
| | | | | | | | 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
* Rename bitstream.h to get_bits.h.Stefano Sabatini2009-04-131-1/+1
| | | | Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use full internal pathname in doxygen @file directives.Diego Biurrun2009-02-011-1/+1
| | | | | | | 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
* Globally rename the header inclusion guard names.Stefano Sabatini2008-08-311-3/+3
| | | | | | | | | 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
* Add correct header #include to fix 'make checkheaders'.Diego Biurrun2008-07-051-1/+1
| | | | Originally committed as revision 14078 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make ff_mlp_read_major_sync() take a GetBitContext instead of buffers.Ramiro Polla2008-07-011-2/+1
| | | | Originally committed as revision 14044 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix make checkheaders, #include <inttypes.h> was missing.Diego Biurrun2007-11-301-0/+2
| | | | Originally committed as revision 11114 to svn://svn.ffmpeg.org/ffmpeg/trunk
* MLP/TrueHD parserIan Caulfield2007-11-281-0/+58
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
OpenPOWER on IntegriCloud