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
2012-02-22mlpdec_parser: fix a few channel layouts.Tim Walker
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
2012-02-21Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (36 commits) adpcmenc: Use correct frame_size for Yamaha ADPCM. avcodec: add ff_samples_to_time_base() convenience function to internal.h adx parser: set duration mlp parser: set duration instead of frame_size gsm parser: set duration mpegaudio parser: set duration instead of frame_size (e)ac3 parser: set duration instead of frame_size flac parser: set duration instead of frame_size avcodec: add duration field to AVCodecParserContext avutil: add av_rescale_q_rnd() to allow different rounding pnmdec: remove useless .pix_fmts libmp3lame: support float and s32 sample formats libmp3lame: renaming, rearrangement, alignment, and comments libmp3lame: use the LAME default bit rate libmp3lame: use avpriv_mpegaudio_decode_header() for output frame parsing libmp3lame: cosmetics: remove some pointless comments libmp3lame: convert some debugging code to av_dlog() libmp3lame: remove outdated comment. libmp3lame: do not set coded_frame->key_frame. libmp3lame: improve error handling in MP3lame_encode_init() ... Conflicts: doc/APIchanges libavcodec/libmp3lame.c libavcodec/pcxenc.c libavcodec/pnmdec.c libavcodec/pnmenc.c libavcodec/sgienc.c libavcodec/utils.c libavformat/hls.c libavutil/avutil.h libswscale/x86/swscale_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-21mlp parser: set duration instead of frame_sizeJustin Ruggles
2011-12-31mlp_parser: Fix infinite loop with 0 bytes_left.Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-10mlp: Use correct speaker locations in TrueHD channel layout.Hendrik Leppkes
(cherry picked from commit d7787835ad737d4f4d8b6f17e04d981632eeaa91) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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-11-25Make channel layout masks unsignedMans Rullgard
It makes more sense for a bit mask to use an unsigned type. The change should be source and binary compatible on all supported systems, hence micro version bump. Fixes a few invalid shifts. Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-11-03Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (44 commits) replacement Indeo 3 decoder gsm demuxer: do not allocate packet twice. flvenc: use first packet delay as global delay. ac3enc: doxygen update. imc: return error codes instead of 0 for error conditions. imc: return meaningful error codes instead of -1 imc: do not set channel layout for stereo imc: validate channel count imc: check for ff_fft_init() failure imc: check output buffer size before decoding imc: use DSPContext.bswap16_buf() to byte-swap packet data rtsp: add allowed_media_types option libgsm: add flush function to reset the decoder state when seeking libgsm: simplify decoding by using a loop gsm: log error message when packet is too small libgsmdec: do not needlessly set *data_size to 0 gsmdec: do not needlessly set *data_size to 0 gsmdec: add flush function to reset the decoder state when seeking libgsmdec: check output buffer size before decoding gsmdec: log error message when output buffer is too small. ... Conflicts: Changelog ffplay.c libavcodec/indeo3.c libavcodec/mjpeg_parser.c libavcodec/vp3.c libavformat/cutils.c libavformat/id3v2.c libavutil/parseutils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-02lavc: use designated initialisers for parsers.Anton Khirnov
2011-10-14Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (22 commits) prores: add FATE tests id3v2: reduce the scope of some non-globally-used symbols/structures id3v2: cosmetics: move some declarations before the places they are used shorten: remove the flush function. shn: do not allow seeking in the raw shn demuxer. avformat: add AVInputFormat flag AVFMT_NO_BYTE_SEEK. avformat: update AVInputFormat allowed flags avformat: don't unconditionally call ff_read_frame_flush() when trying to seek. truespeech: use sizeof() instead of hardcoded sizes truespeech: remove unneeded variable, 'consumed' truespeech: simplify truespeech_read_frame() by using get_bits() truespeech: decode directly to output buffer instead of a temp buffer truespeech: check to make sure channels == 1 truespeech: check for large enough output buffer rather than truncating output truespeech: remove unneeded zero-size packet check. mlpdec: return meaningful error codes instead of -1 mlpdec: remove unnecessary wrapper function mlpdec: only calculate output size once mlpdec: validate that the reported channel count matches the actual output channel count pcm: reduce pointer type casting ... Conflicts: libavformat/avformat.h libavformat/id3v2.c libavformat/id3v2.h libavformat/utils.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-13mlpdec: return meaningful error codes instead of -1Justin Ruggles
2011-05-13Map mlp surround channels to FFmpeg rear channels.Carl Eugen Hoyos
This allows more 3rd party applications to correctly read the resulting wav files.
2011-04-19Only ask once in the code for a TrueHD sample with strange channel layout.Carl Eugen Hoyos
2011-04-19Make MLP/TrueHD channel layout functions visible to the decoder.Carl Eugen Hoyos
2011-04-03Merge remote branch 'qatar/master'Michael Niedermayer
* qatar/master: Fixed-point MDCT with 32-bit unscaled output lavc: deprecate rate_emu lavc: mark hurry_up for removal on next major bump parser: mark av_parser_parse() for removal on next major bump lavc: add missing audioconvert includes jvdec: don't use deprecated CODEC_TYPE_*/PKT_FLAG_KEY Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-02lavc: add missing audioconvert includesAnton Khirnov
2011-04-02Make a plausibility check when setting channel layout for TrueHD.Carl Eugen Hoyos
TrueHD supports more channels than FFmpeg, so a valid sample could set the channel layout to a value that represents less channels than the sample actually consists of.
2011-03-31Merge remote-tracking branch 'newdev/master'Michael Niedermayer
* newdev/master: rtsp: Use GET_PARAMETER for keep-alive for generic RTSP servers mlp_parse.c: set AVCodecContext channel_layout APIChanges: mark the place where 0.6 was branched. avio: make get_checksum() internal. avio: move ff_crc04C11DB7_update() from avio.h -> avio_internal.h avio: make init_checksum() internal. NOT MERGED Add MxPEG decoder NOT MERGED Add support for picture_ptr field in MJpegDecodeContext NOT MERGED Move MJPEG's input buffer preprocessing in separate public function NOT MERGED Support reference picture defined by bitmask in MJPEG's SOS decoder sndio bug fix Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-30mlp_parse.c: set AVCodecContext channel_layoutJohn Stebbins
The channel layout isn't getting set for mlp and truehd audio. Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-03-19Replace FFmpeg with Libav in licence headersMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-28Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.Diego Elio Pettenò
None of these symbols should be accessed directly, so declare them as hidden. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit d36beb3f6902b1217beda576aa18abf7eb72b03c)
2011-01-26Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.Diego Elio Pettenò
None of these symbols should be accessed directly, so declare them as hidden. Signed-off-by: Mans Rullgard <mans@mansr.com>
2010-11-12Replace deprecated symbols SAMPLE_FMT_* with AV_SAMPLE_FMT_*, and enumStefano Sabatini
SampleFormat with AVSampleFormat. Originally committed as revision 25730 to svn://svn.ffmpeg.org/ffmpeg/trunk
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
2010-02-23mlp_parser: Fix memleak.Jai Menon
ff_combine_frame() is called, which allocates ParseContext->buffer if needed, so ff_parse_close() must be called to free it. Patch by jai. Originally committed as revision 22005 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-27Fix possible crashes in mlp parser, it tries to go back 7 bytes afterReimar Döffinger
finding the 4-byte signature. Add a check that ignores the signature if we do not have enough previous data to go back at least 7 bytes. Originally committed as revision 21487 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-03-20Split TrueHD decoder from MLPRamiro Polla
Originally committed as revision 18045 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-12-07mlp: support bit-depths greater than 16 by default.Ramiro Polla
Originally committed as revision 16026 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-06mlp: Fix compilation under CONFIG_AUDIO_NONSHORT.Mathieu Velten
Patch by Mathieu Velten < matmaul at gmail dot com > Originally committed as revision 16021 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-03mlp: initialize all CRC tables in a common function.Laurent Aimar
This way the decoder does not have to depend on the parser being initialized before. Patch by Laurent Aimar <fenrir at via dot ecp dot fr>. Originally committed as revision 15986 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-13mlp: Split common code from parser and decoder to be used by encoder.Ramiro Polla
Originally committed as revision 14733 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-13mlp_parser: Initialize crc data in its own function.Ramiro Polla
Originally committed as revision 14722 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-05Add required stdint.h header #include.Diego Biurrun
Originally committed as revision 14077 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-05spelling cosmeticsDiego Biurrun
Originally committed as revision 14076 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-02Clarify comment about parity nibble.Ramiro Polla
Originally committed as revision 14047 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
2008-06-28Seek the file forwards instead of backwards when sync is lost.Ramiro Polla
Originally committed as revision 14014 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-25Make it a little easier to spot that the code is not dealing only withRamiro Polla
substream headers. Originally committed as revision 13961 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-09Use full path for #includes from another directory.Diego Biurrun
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-03cosmetics: spelling fixesDiego Biurrun
Originally committed as revision 11155 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