summaryrefslogtreecommitdiffstats
path: root/libavcodec/flac.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'acc897e6b15776ed438b88ffe330ec48f6b50e48'Michael Niedermayer2014-11-061-1/+8
|\ | | | | | | | | | | | | * commit 'acc897e6b15776ed438b88ffe330ec48f6b50e48': lavc: make avpriv_flac_is_extradata_valid() private on the next bump Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: make avpriv_flac_is_extradata_valid() private on the next bumpAnton Khirnov2014-11-061-1/+8
| |
* | Merge commit 'c070a8751597e3aa1b443e88464da785d8966b14'Michael Niedermayer2014-11-061-1/+9
|\ \ | |/ | | | | | | | | | | * commit 'c070a8751597e3aa1b443e88464da785d8966b14': lavc: make avpriv_flac_parse_streaminfo() private on the next bump Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: make avpriv_flac_parse_streaminfo() private on the next bumpAnton Khirnov2014-11-061-1/+9
| |
* | Merge commit '9325d88eba8038b3e2a4485e473a018410379e2d'Michael Niedermayer2014-08-101-8/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '9325d88eba8038b3e2a4485e473a018410379e2d': lavc: remove obsolete and disabled avpriv functions Conflicts: libavcodec/dv_profile.c libavcodec/dv_profile.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: remove obsolete and disabled avpriv functionsAnton Khirnov2014-08-091-8/+0
| |
* | Merge commit '5fdaf312c5541b77b6364db8b49d6abb416a25c0'Michael Niedermayer2014-05-281-7/+3
|\ \ | |/ | | | | | | | | | | * commit '5fdaf312c5541b77b6364db8b49d6abb416a25c0': flac: make avpriv_flac_parse_block_header() inline Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flac: make avpriv_flac_parse_block_header() inlineAnton Khirnov2014-05-281-7/+3
| | | | | | | | | | | | This avoids all the ABI troubles associated with avpriv_. Since this function is very small and does not depend on any tables, making it inline should have no adverse effects.
* | Merge commit 'f13ffb6636fdecb5e3e0ddcff48f096e7b3db362'Michael Niedermayer2014-05-281-1/+4
|\ \ | |/ | | | | | | | | | | * commit 'f13ffb6636fdecb5e3e0ddcff48f096e7b3db362': flacdec: do not overwrite a channel layout set by the caller Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flacdec: do not overwrite a channel layout set by the callerAnton Khirnov2014-05-281-1/+4
| | | | | | | | | | The channel layout mask for non-standard layouts is typically stored at the container level (as a vorbiscomment tag) for FLAC.
* | Merge commit '45ee556d51ef04d79d52bf6b0b7f28a4d231cb0c'Michael Niedermayer2013-07-291-8/+8
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '45ee556d51ef04d79d52bf6b0b7f28a4d231cb0c': qdm2: Whitespace cosmetics flac: use meaningful return values Conflicts: libavcodec/flacdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flac: use meaningful return valuesLuca Barbato2013-07-281-8/+8
| |
| * flac: add channel layout masks for streams with 7 or 8 channels.Tim Walker2013-02-061-2/+4
| | | | | | | | | | | | | | They were added to the latest FLAC specification: https://git.xiph.org/?p=flac-website.git;a=commit;h=65c199a2 Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | flac: add channel layout masks for streams with 7 or 8 channelsTim Walker2013-02-061-2/+4
| | | | | | | | | | They were added to the latest FLAC specification: https://git.xiph.org/?p=flac-website.git;a=commit;h=65c199a2
* | get_bits: rename get_bits_longlong to get_bits64Michael Niedermayer2012-12-081-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'Michael Niedermayer2012-11-121-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '97bf7c03b1338a867da52c159a2afecbdedcfa88': doc: git-howto: Leave reviewers time to react before pushing patches Include libavutil/channel_layout.h instead of libavutil/audioconvert.h lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/git-howto.texi ffmpeg_filter.c libavcodec/flacdec.c libavcodec/imc.c libavcodec/mpegaudiodec.c libavcodec/utils.c libavfilter/asrc_anullsrc.c libavfilter/audio.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/avfiltergraph.c libavfilter/buffer.c libavutil/Makefile libavutil/audioconvert.h libavutil/channel_layout.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Include libavutil/channel_layout.h instead of libavutil/audioconvert.hJustin Ruggles2012-11-111-1/+1
| | | | | | | | Also reorder some other #include when applicable.
* | Merge commit '50a65e7a540ce6747f81d6dbf6a602ad35be77ff'Michael Niedermayer2012-11-021-0/+19
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '50a65e7a540ce6747f81d6dbf6a602ad35be77ff': (24 commits) vmdaudio: set channel layout twinvq: validate sample rate code twinvq: set channel layout twinvq: validate that channels is not <= 0 truespeech: set channel layout sipr: set channel layout shorten: validate that the channel count in the header is not <= 0 ra288dec: set channel layout ra144dec: set channel layout qdm2: remove unneeded checks for channel count qdm2: make sure channels is not <= 0 and set channel layout qcelpdec: set channel layout nellymoserdec: set channels to 1 libopencore-amr: set channel layout for amr-nb or if not set by the user libilbc: set channel layout dpcm: use AVCodecContext.channels instead of keeping a private copy imc: set channels to 1 instead of validating it gsmdec: always set channel layout and sample rate at initialization libgsmdec: always set channel layout and sample rate at initialization g726dec: do not validate sample rate ... Conflicts: libavcodec/dpcm.c libavcodec/qdm2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flacdec: allow mid-stream channel layout changeJustin Ruggles2012-11-011-0/+19
| | | | | | | | | | Although the libFLAC decoder cannot handle such a change, it is allowed by the spec and could potentially occur with live streams.
* | flac: use get_bits_longlong()Paul B Mahol2012-09-301-2/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-121-0/+74
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: build: Fix Ogg demuxer dependencies build: Fix FLAC demuxer dependencies flac: Move flac functions shared between libraries to flac common code build: Fix CAF demuxer dependencies build: Fix MP2 muxer dependencies build: Add missing build rules for the ISMV muxer configure: Drop redundant mxf_d10 test dependency declaration Support AAC encoding via the external library fdk-aac libavcodec: Add more AAC profiles dct/fft-test: use a replacement getopt() if the system has none present. Conflicts: Changelog libavcodec/Makefile libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flac: Move flac functions shared between libraries to flac common codeDiego Biurrun2012-07-121-0/+74
| | | | | | | | This fixes a number of flac-related build dependencies.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-041-1/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (29 commits) lavfi: reclassify showfiltfmts as a TESTPROG graph2dot: fix printf format specifier swscale: yuv2planeX 8bit >=sse2 functions need aligned stack on x86-32. vp8: loopfilter >=sse2 functions need aligned stack on x86-32. amr: remove shift out of the AMR_BIT() macro. dsputilenc: group yasm and inline asm function pointer assignment. mov: use forward declaration of a function instead of a table. Clarify Doxygen comment for FF_API_* #defines. configure: simplify get_version() Create version.h headers for libraries that lack them gitignore: Use full path instead of relative path to specify patterns mpegvideo: remove VLAs Add XTEA encryption support in libavutil Add Blowfish encryption support in libavutil eval: Add the isinf() function and tests for it flacdec: move lpc filter to flacdsp flacdec: split off channel decorrelation as flacdsp avplay: Add an option for not limiting the input buffer size FATE: add a test for WMA cover art. FATE: add a test for apetag cover art ... Conflicts: .gitignore configure ffplay.c libavcodec/Makefile libavcodec/error_resilience.c libavcodec/mpegvideo.c libavcodec/ratecontrol.c libavdevice/avdevice.h libavfilter/Makefile libavfilter/filtfmts.c libavfilter/version.h libavformat/mov.c libavformat/version.h libavutil/Makefile libavutil/avutil.h libavutil/version.h libswscale/swscale.h libswscale/x86/swscale_mmx.c tests/fate/libavutil.mak tests/lavfi-regression.sh tools/graph2dot.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flac: make FLAC_CHMODE_* constants consecutiveMans Rullgard2012-07-041-1/+2
| |
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Revert "Set channel layout in flac decoder."Michael Niedermayer2012-02-241-3/+0
| | | | | | | | | | | | | | | | | | | | This reverts commit 2ef2496cd19eb833f4ad22a5051c11be80d09598. Conflicts: libavcodec/Makefile Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Revert "Fix channel layout for some stereo flac files."Michael Niedermayer2012-02-241-1/+0
| | | | | | | | This reverts commit d2ee3c913d6fec3cb8c0c1b67347007c7cd604e1.
* | Fix channel layout for some stereo flac files.Carl Eugen Hoyos2011-04-291-0/+1
| |
* | Set channel layout in flac decoder.Carl Eugen Hoyos2011-04-231-0/+3
|/
* cosmetics: line wrap after last commitJustin Ruggles2010-12-071-7/+14
| | | | Originally committed as revision 25913 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add log_level_offset parameter to ff_flac_decode_frame_header(). It will be usedMichael Chinen2010-12-071-9/+9
| | | | | | | to optionally silence the error messages. Patch by Michael Chinen [mchinen at gmail] Originally committed as revision 25912 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add is_var_size and frame_or_sample_num to FLACFrameInfo and read them inMichael Chinen2010-12-071-3/+4
| | | | | | | ff_flac_decode_frame_header(). Patch by Michael Chinen [mchinen at gmail] Originally committed as revision 25911 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Check validity of the frame sync code in ff_flac_decode_frame_header().Michael Chinen2010-12-071-1/+7
| | | | | | Patch by Michael Chinen [mchinen at gmail] Originally committed as revision 25910 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move decode_frame_header() from flacdec.c to flac.c/h to share with theMichael Chinen2010-12-071-0/+94
| | | | | | | forthcoming FLAC parser. Patch by Michael Chinen [mchinen at gmail] Originally committed as revision 25909 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add a function to calculate a more accurate estimate for maximum FLACJustin Ruggles2009-03-211-0/+43
| | | | | | frame size and use the function in the FLAC decoder and FLAC encoder Originally committed as revision 18092 to svn://svn.ffmpeg.org/ffmpeg/trunk
* rename flac.c to flacdec.cJustin Ruggles2009-01-231-795/+0
| | | | Originally committed as revision 16735 to svn://svn.ffmpeg.org/ffmpeg/trunk
* flacdec: add support for 3 additional sample rate codesJustin Ruggles2009-01-221-2/+3
| | | | Originally committed as revision 16723 to svn://svn.ffmpeg.org/ffmpeg/trunk
* fix issue 616 on roundup : decoding of short flac filesJai Menon2008-09-031-1/+1
| | | | Originally committed as revision 15177 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Modify all codecs to report their supported input and output sample format(s).Peter Ross2008-07-311-0/+1
| | | | Originally committed as revision 14482 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Support reading large metadata.Michael Niedermayer2008-07-181-1/+14
| | | | | | fixes issue187 Originally committed as revision 14281 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make bitstream_* fields unsigned.Michael Niedermayer2008-07-181-2/+2
| | | | Originally committed as revision 14280 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Only realloc() bitstream buffer when the needed size increased,Michael Niedermayer2008-07-181-1/+2
| | | | | | this is needed to prevent loosing bitstream data with large metadata. Originally committed as revision 14279 to svn://svn.ffmpeg.org/ffmpeg/trunk
* If metadata has been parsed goto end instead of trying toMichael Niedermayer2008-07-181-3/+3
| | | | | | decorrelate and output somehing nonexistng. Originally committed as revision 14278 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make our flac decoder decode all the data at EOF.Michael Niedermayer2008-07-131-1/+2
| | | | | | Fixes issue524 Originally committed as revision 14223 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mark read-only data as constStefan Gehrer2008-06-241-3/+3
| | | | Originally committed as revision 13947 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make AVCodec long_names definition conditional depending on CONFIG_SMALL.Stefano Sabatini2008-06-121-1/+1
| | | | Originally committed as revision 13759 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use full path for #includes from another directory.Diego Biurrun2008-05-091-1/+1
| | | | Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Indent.Ramiro Polla2008-05-041-4/+4
| | | | Originally committed as revision 13054 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Do not read out of array bounds.Ramiro Polla2008-05-041-0/+4
| | | | Originally committed as revision 13053 to svn://svn.ffmpeg.org/ffmpeg/trunk
* move call to init_get_bits inside conditionalJustin Ruggles2008-05-021-1/+1
| | | | Originally committed as revision 13037 to svn://svn.ffmpeg.org/ffmpeg/trunk
OpenPOWER on IntegriCloud