summaryrefslogtreecommitdiff
path: root/libavcodec/flac.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '50a65e7a540ce6747f81d6dbf6a602ad35be77ff'Michael Niedermayer2012-11-021-0/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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/+3
| | | | | | | | | | Although the libFLAC decoder cannot handle such a change, it is allowed by the spec and could potentially occur with live streams.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-041-4/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-4/+4
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-211-7/+7
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (47 commits) lavc: hide private symbols. lavc: deprecate img_get_alpha_info(). lavc: use avpriv_ prefix for ff_toupper4. lavc: use avpriv_ prefix for ff_copy_bits and align_put_bits. lavc: use avpriv_ prefix for ff_ac3_parse_header. lavc: use avpriv_ prefix for ff_frame_rate_tab. lavc: rename ff_find_start_code to avpriv_mpv_find_start_code lavc: use avpriv_ prefix for ff_split_xiph_headers. lavc: use avpriv_ prefix for ff_dirac_parse_sequence_header. lavc: use avpriv_ prefix for some dv symbols used in lavf. lavc: use avpriv_ prefix for some flac symbols used in lavf. lavc: use avpriv_ prefix for some mpeg4audio symbols used in lavf. lavc: use avpriv_ prefix for some mpegaudio symbols used in lavf. lavc: use avpriv_ prefix for ff_aac_parse_header(). lavf: hide private symbols. lavf: use avpriv_ prefix for some dv functions. lavf: use avpriv_ prefix for ff_new_chapter(). avcodec: add CODEC_CAP_DELAY note to avcodec_decode_audio3() documentation avcodec: clarify the CODEC_CAP_DELAY note in avcodec_decode_video2() avcodec: clarify documentation of CODEC_CAP_DELAY ... Conflicts: configure doc/general.texi libavcodec/Makefile libavcodec/aacdec.c libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/dv.c libavcodec/dvdata.c libavcodec/dvdata.h libavcodec/libspeexenc.c libavcodec/mpegvideo.c libavcodec/version.h libavformat/avidec.c libavformat/dv.c libavformat/dv.h libavformat/flvenc.c libavformat/mov.c libavformat/mp3enc.c libavformat/oggparsespeex.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: use avpriv_ prefix for some flac symbols used in lavf.Anton Khirnov2011-10-201-7/+7
| | | | | | | | | | Specifically, ff_flac_parse_streaminfo, ff_flac_is_extradata_valid and ff_flac_parse_block_header
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
|/ | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* Define FLAC_MIN_FRAME_SIZE and use it in the FLAC decoder.Michael Chinen2010-12-071-0/+1
| | | | | | Patch by Michael Chinen [mchinen at gmail] Originally committed as revision 25916 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-1/+2
| | | | | | | 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-0/+5
| | | | | | | ff_flac_decode_frame_header(). Patch by Michael Chinen [mchinen at gmail] Originally committed as revision 25911 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/+10
| | | | | | | forthcoming FLAC parser. Patch by Michael Chinen [mchinen at gmail] Originally committed as revision 25909 to svn://svn.ffmpeg.org/ffmpeg/trunk
* 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
* flacdec: split frame header decoding and validation into a separateJustin Ruggles2009-03-241-3/+12
| | | | | | function Originally committed as revision 18175 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: vertical alignmentJustin Ruggles2009-03-221-1/+1
| | | | Originally committed as revision 18149 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add a function to calculate a more accurate estimate for maximum FLACJustin Ruggles2009-03-211-0/+8
| | | | | | 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
* share channel mode constants between the FLAC decoder and FLAC encoderJustin Ruggles2009-03-211-0/+7
| | | | Originally committed as revision 18082 to svn://svn.ffmpeg.org/ffmpeg/trunk
* share some constants between the FLAC encoder and FLAC decoderJustin Ruggles2009-03-191-0/+3
| | | | Originally committed as revision 18041 to svn://svn.ffmpeg.org/ffmpeg/trunk
* flacdec: Add a shared function for parsing a FLAC metadata block header.Justin Ruggles2009-03-061-0/+10
| | | | Originally committed as revision 17851 to svn://svn.ffmpeg.org/ffmpeg/trunk
* flacdec: Remove unused variable, min_blocksize.Justin Ruggles2009-03-031-1/+0
| | | | Originally committed as revision 17748 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use a shared function to validate FLAC extradata.Justin Ruggles2009-02-261-0/+16
| | | | Originally committed as revision 17602 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
* flacdec: get total number of samples from STREAMINFOJustin Ruggles2009-01-251-0/+1
| | | | Originally committed as revision 16768 to svn://svn.ffmpeg.org/ffmpeg/trunk
* move FLAC_STREAMINFO_SIZE to flac.hJustin Ruggles2009-01-251-0/+2
| | | | Originally committed as revision 16766 to svn://svn.ffmpeg.org/ffmpeg/trunk
* define FLAC metadata types in flac.hJustin Ruggles2009-01-251-0/+11
| | | | Originally committed as revision 16765 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
* include avcodec.hJustin Ruggles2008-05-021-0/+2
| | | | Originally committed as revision 13039 to svn://svn.ffmpeg.org/ffmpeg/trunk
* share streaminfo parsing functionJustin Ruggles2008-05-021-0/+13
| | | | Originally committed as revision 13036 to svn://svn.ffmpeg.org/ffmpeg/trunk
* split out some decoder context params to a shared macroJustin Ruggles2008-05-021-0/+42
Originally committed as revision 13035 to svn://svn.ffmpeg.org/ffmpeg/trunk
View Lorry Controller Status