Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-21af_pan: move query_format before config_props.Nicolas George
That is the logical order in which the functions are called, and there is no longer any need of forward declarations.
2012-02-21af_pan: remove the indirect function call.Nicolas George
libswresample is used in all cases.
2012-02-21adpcmenc: Use correct frame_size for Yamaha ADPCM.Justin Ruggles
Output packet size should match avctx->block_align. The target output packet size is 1024 bytes. Before: mono - 1024 samples -> 512 bytes stereo - 2048 samples -> 2048 bytes After: mono - 2048 samples -> 1024 bytes stereo - 1024 samples -> 1024 bytes
2012-02-21Add missing av_free_packet.Reimar Döffinger
Fixes memory leak when encoding at least with mpegvideo using the new encode2 function. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2012-02-21avcodec: add ff_samples_to_time_base() convenience function to internal.hJustin Ruggles
2012-02-21adx parser: set durationJustin Ruggles
2012-02-21mlp parser: set duration instead of frame_sizeJustin Ruggles
2012-02-21gsm parser: set durationJustin Ruggles
2012-02-21mpegaudio parser: set duration instead of frame_sizeJustin Ruggles
2012-02-21(e)ac3 parser: set duration instead of frame_sizeJustin Ruggles
2012-02-21flac parser: set duration instead of frame_sizeJustin Ruggles
2012-02-21avcodec: add duration field to AVCodecParserContextJustin Ruggles
This will allow parsers to export the duration of the current frame being output, if known, instead of using AVCodecContext.frame_size.
2012-02-21avutil: add av_rescale_q_rnd() to allow different roundingJustin Ruggles
2012-02-20af_pan: reindent after last commit.Nicolas George
2012-02-20af_pan: use libswr for rematrixing.Nicolas George
2012-02-20libswr: allow to set custom matrices.Nicolas George
2012-02-20matroskadec: remove H.264 special-case that disabled header parsing.Reimar Döffinger
The parser was fixed so this workaround should no longer be necessary. This allows using stream-copy to fix files with keyframes incorrectly marked. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2012-02-20pnmdec: remove useless .pix_fmtsPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
2012-02-20libmp3lame: support float and s32 sample formatsJustin Ruggles
2012-02-20libmp3lame: renaming, rearrangement, alignment, and commentsJustin Ruggles
2012-02-20libmp3lame: use the LAME default bit rateJustin Ruggles
Also, only set bit rate for CBR.
2012-02-20libmp3lame: use avpriv_mpegaudio_decode_header() for output frame parsingJustin Ruggles
2012-02-20libmp3lame: cosmetics: remove some pointless commentsJustin Ruggles
2012-02-20libmp3lame: convert some debugging code to av_dlog()Justin Ruggles
also remove unneeded commented-out full frame data debugging
2012-02-20libmp3lame: remove outdated comment.Justin Ruggles
We now require at least libmp3lame 3.98.3. lame_encode_buffer_interleaved() still doesn't work for mono, but it does not "die"; it just expects a stereo interleaved buffer.
2012-02-20libmp3lame: do not set coded_frame->key_frame.Justin Ruggles
it is already set in avcodec_alloc_frame()
2012-02-20libmp3lame: improve error handling in MP3lame_encode_init()Justin Ruggles
2012-02-20libmp3lame: remove unneeded 'stereo' field from Mp3AudioContextJustin Ruggles
2012-02-20ffprobe: report bit rate in stream descriptionMatthieu Bouron
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2012-02-20lavc: set bit_rate in the decoder context, just after the init stageStefano Sabatini
Also move the get_bit_rate() function, in order to avoid an undefined symbol reference in avcodec_open2().
2012-02-20hls: Reset the AVIOContext when seekingMartin Storsjö
This avoids reading any old data in the AVIOContext buffer after the seek, and indicates to the mpegts demuxer that we've seeked, avoiding continuity check errors. Signed-off-by: Martin Storsjö <martin@martin.st>
2012-02-20doc: fix channel layout value in abuffer example.Clément Bœsch
The channel layout must start with 0x, otherwise it is parsed as a number of channels.
2012-02-20pcxenc: switch to encode2().Anton Khirnov
2012-02-20sgienc: switch to encode2().Anton Khirnov
2012-02-20targaenc: switch to encode2().Anton Khirnov
2012-02-20targaenc: don't modify input frame.Anton Khirnov
Set the pict_type/key_frame properties on the coded picture.
2012-02-20roqvideoenc: switch to encode2().Anton Khirnov
2012-02-20roqvideoenc: add const qualifier to the input frame.Anton Khirnov
2012-02-20pnmenc: switch to encode2().Anton Khirnov
2012-02-20huffyuv: switch to encode2().Anton Khirnov
2012-02-20v410enc: switch to encode2().Anton Khirnov
2012-02-20zmbvenc: switch to encode2().Anton Khirnov
2012-02-20zmbvenc: move header writing to the end of encode_frame().Anton Khirnov
This makes switching to encode2() simpler, because it allows us to know exactly how large should the output buffer be before we start writing into it.
2012-02-20Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: doxy: remove reference to removed api examples: unbreak compilation ttadec: cosmetics: reindent sunrast: use RLE trigger macro inplace of the hard coded value. sunrastenc: set keyframe flag for the output packet. mpegvideo_enc: switch to encode2(). mpegvideo_enc: force encoding delay of at least 1 frame when low_delay=0 Conflicts: doc/examples/muxing.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-20h264: don't use redzone in loopfilter on win64.Ronald S. Bultje
Red zone usage is not allowed in the Win64 ABI.
2012-02-20Revert two swscale commits.Ronald S. Bultje
Revert "swscale: update context offsets after removal of AlpMmxFilter." (commit a95e3fa90b4190381b65d180eec5a4027075e2da) and Revert "swscale: Remove some write-only variables related to alpha handling." (commit 9d03cb9fc5ddf914920ab0dbe13f19a34c754966). They broke alpha handling - it's the evil inline asm that still uses that variable, so it's not truely write-only.
2012-02-20wmalossless: Fix infinite loop.Michael Niedermayer
Fixes more of Ticket1000 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-20wmalossless: Switch to new audio APIMichael Niedermayer
Partially fixes Ticket1000 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-20wmalossless: remove tabMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>