summaryrefslogtreecommitdiff
path: root/libavcodec/flac.c
Commit message (Collapse)AuthorAge
* get_bits: rename get_bits_longlong to get_bits64Michael Niedermayer2012-12-08
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'Michael Niedermayer2012-11-12
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-11
| | | | | | | | Also reorder some other #include when applicable.
* | Merge commit '50a65e7a540ce6747f81d6dbf6a602ad35be77ff'Michael Niedermayer2012-11-02
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-01
| | | | | | | | | | 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-30
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-12
| | | | | | | | This fixes a number of flac-related build dependencies.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-04
| |
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Revert "Set channel layout in flac decoder."Michael Niedermayer2012-02-24
| | | | | | | | | | | | | | | | | | | | 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-24
| | | | | | | | This reverts commit d2ee3c913d6fec3cb8c0c1b67347007c7cd604e1.
* | Fix channel layout for some stereo flac files.Carl Eugen Hoyos2011-04-29
| |
* | Set channel layout in flac decoder.Carl Eugen Hoyos2011-04-23
|/
* cosmetics: line wrap after last commitJustin Ruggles2010-12-07
| | | | 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-07
| | | | | | | 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-07
| | | | | | | 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-07
| | | | | | 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-07
| | | | | | | 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-21
| | | | | | 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-23
| | | | Originally committed as revision 16735 to svn://svn.ffmpeg.org/ffmpeg/trunk
* flacdec: add support for 3 additional sample rate codesJustin Ruggles2009-01-22
| | | | Originally committed as revision 16723 to svn://svn.ffmpeg.org/ffmpeg/trunk
* fix issue 616 on roundup : decoding of short flac filesJai Menon2008-09-03
| | | | 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-31
| | | | Originally committed as revision 14482 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Support reading large metadata.Michael Niedermayer2008-07-18
| | | | | | fixes issue187 Originally committed as revision 14281 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make bitstream_* fields unsigned.Michael Niedermayer2008-07-18
| | | | Originally committed as revision 14280 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Only realloc() bitstream buffer when the needed size increased,Michael Niedermayer2008-07-18
| | | | | | 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-18
| | | | | | 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-13
| | | | | | Fixes issue524 Originally committed as revision 14223 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mark read-only data as constStefan Gehrer2008-06-24
| | | | 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-12
| | | | Originally committed as revision 13759 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use full path for #includes from another directory.Diego Biurrun2008-05-09
| | | | Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Indent.Ramiro Polla2008-05-04
| | | | Originally committed as revision 13054 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Do not read out of array bounds.Ramiro Polla2008-05-04
| | | | Originally committed as revision 13053 to svn://svn.ffmpeg.org/ffmpeg/trunk
* move call to init_get_bits inside conditionalJustin Ruggles2008-05-02
| | | | Originally committed as revision 13037 to svn://svn.ffmpeg.org/ffmpeg/trunk
* share streaminfo parsing functionJustin Ruggles2008-05-02
| | | | Originally committed as revision 13036 to svn://svn.ffmpeg.org/ffmpeg/trunk
* split out some decoder context params to a shared macroJustin Ruggles2008-05-02
| | | | Originally committed as revision 13035 to svn://svn.ffmpeg.org/ffmpeg/trunk
* change function parameters for dump_headers()Justin Ruggles2008-05-02
| | | | Originally committed as revision 13034 to svn://svn.ffmpeg.org/ffmpeg/trunk
* change function parameters for metadata_streaminfo()Justin Ruggles2008-05-02
| | | | Originally committed as revision 13033 to svn://svn.ffmpeg.org/ffmpeg/trunk
* remove unused variable, min_framesizeJustin Ruggles2008-04-29
| | | | Originally committed as revision 13015 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add long names to many AVCodec declarations.Stefano Sabatini2008-04-27
| | | | | | patch by Stefano Sabatini, stefano.sabatini-lala poste it Originally committed as revision 13005 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Apply 'cold' attribute to init/uninit functions in libavcodecZuxy Meng2008-03-21
| | | | Originally committed as revision 12525 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix ;;Michael Niedermayer2008-02-19
| | | | Originally committed as revision 12153 to svn://svn.ffmpeg.org/ffmpeg/trunk
* constMichael Niedermayer2008-02-01
| | | | Originally committed as revision 11725 to svn://svn.ffmpeg.org/ffmpeg/trunk
* improve CRC APIAurelien Jacobs2008-01-04
| | | | | | | - don't export any global var - provide either generated or hardcoded tables Originally committed as revision 11409 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add decoding support for variable block size FLAC files using the latest FLACJosh Coalson2007-11-04
| | | | | | specification. Patch by Josh Coalson. Originally committed as revision 10916 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add support for FLAC's new RICE2 entropy coding method. Patch by Josh Coalson.Josh Coalson2007-11-03
| | | | Originally committed as revision 10915 to svn://svn.ffmpeg.org/ffmpeg/trunk
* 20% faster lpc, 6% overall flac decodingLoren Merritt2007-09-30
| | | | Originally committed as revision 10627 to svn://svn.ffmpeg.org/ffmpeg/trunk
* replace FIR with finite differences.Loren Merritt2007-09-30
| | | | | | | 3x faster decode_subframe_fixed(). overall flac decoding: 10% faster if file was encoded with fixed predictors. Originally committed as revision 10626 to svn://svn.ffmpeg.org/ffmpeg/trunk