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
path: root/libavformat
AgeCommit message (Collapse)Author
2013-05-04Merge commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7'Michael Niedermayer
* commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7': silly typo fixes Conflicts: doc/protocols.texi libavcodec/aacpsy.c libavformat/utils.c tools/patcheck Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03silly typo fixesDiego Biurrun
2013-05-03Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: compat: msvc: Make sure the object files are included when linking statically id3v2: check for end of file while unescaping tags Conflicts: configure libavformat/id3v2.c Note, ffmpeg is not affected by the out of buffer write bug Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03Merge commit 'e3b225a4fe0ff1e64a220b757c6f0a5cf9258521'Michael Niedermayer
* commit 'e3b225a4fe0ff1e64a220b757c6f0a5cf9258521': matroskaenc: add an option to put the index at the start of the file Conflicts: doc/muxers.texi libavformat/matroskaenc.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03Merge commit '0574bc06d23a6690a16c5926dddc9be359a3d7bb'Michael Niedermayer
* commit '0574bc06d23a6690a16c5926dddc9be359a3d7bb': matroskaenc: cosmetics, reorder the #includes Conflicts: libavformat/matroskaenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03Merge commit '13f57a4d881ec669b87bf82f424bfff502433060'Michael Niedermayer
* commit '13f57a4d881ec669b87bf82f424bfff502433060': wav: K&R formatting cosmetics Conflicts: libavformat/wavdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03id3v2: check for end of file while unescaping tagsLuca Barbato
Prevent a serious out of buffer bound write. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org
2013-05-03matroskaenc: add an option to put the index at the start of the fileAnton Khirnov
2013-05-03matroskaenc: cosmetics, reorder the #includesAnton Khirnov
2013-05-02wav: K&R formatting cosmeticsLuca Barbato
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-05-02nutdec: Implement duration parsing for indexed nutsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-02Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: id3v2: K&R formatting cosmetics ppc: Only compile AltiVec FFT assembly when AltiVec is enabled Conflicts: libavformat/id3v2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-02id3v2: K&R formatting cosmeticsLuca Barbato
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-05-01Merge remote-tracking branch 'cigaes/master'Michael Niedermayer
* cigaes/master: lavc: copy subtitle_header when copying context. lavf: data muxer and demuxer. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01Merge commit 'e926b5ceb1962833f0c884a328382bc2eca67aff'Michael Niedermayer
* commit 'e926b5ceb1962833f0c884a328382bc2eca67aff': avformat: Drop unnecessary ff_ name prefixes from static functions Conflicts: libavformat/audiointerleave.c libavformat/mux.c libavformat/mxfenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01lavf: data muxer and demuxer.Nicolas George
Allow to use tools designed to work with demuxers, muxers and packets (for example ffmpeg itself) to process raw byte streams (like aviocat).
2013-04-30avformat: Drop unnecessary ff_ name prefixes from static functionsDiego Biurrun
2013-04-30framecrcenc: workaround design flaw in sidedata paletteMichael Niedermayer
This should be reverted once palettes are dealt with in a endian independant way in packets Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-29Recognize j2k as file suffix for the image2 muxer.Carl Eugen Hoyos
2013-04-28Merge commit 'c14010541035454b4d3ad08399d70423be4e0c87'Michael Niedermayer
* commit 'c14010541035454b4d3ad08399d70423be4e0c87': oma: K&R formatting cosmetics Conflicts: libavformat/omadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-28Merge commit 'cf679b9476727a237c8006c685ace18acba149ab'Michael Niedermayer
* commit 'cf679b9476727a237c8006c685ace18acba149ab': hls, segment: fix splitting for audio-only streams. Conflicts: libavformat/hlsenc.c libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-28avformat: Add black ops audio demuxerMichael Niedermayer
Fixes Ticket2064 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-27oma: K&R formatting cosmeticsLuca Barbato
2013-04-27hls, segment: fix splitting for audio-only streams.Anton Khirnov
CC:libav-stable@libav.org
2013-04-26avformat/write_packet: drop disabled codeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-26avformat/mux: set avoid_negative_ts based on flags if not overridden by user ↵Michael Niedermayer
or muxer This changes the default to avoid negative timestamps. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-26avformat/movenc: mov/mp4 should support negative timestamps through edit listsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-26avformat/mux: assert that timestamps are positive after offsetting themMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-26avformat/mux: use a local variable for offsetMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-26avformat/mux: change avoid_negative_ts code to support later addition of ↵Michael Niedermayer
AVStreams Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-26Merge commit 'c2cb01d418dd18e1cf997c038d37378d773121be'Michael Niedermayer
* commit 'c2cb01d418dd18e1cf997c038d37378d773121be': lavf: introduce AVFMT_TS_NEGATIVE Conflicts: libavformat/avformat.h libavformat/mux.c tests/ref/lavf/asf tests/ref/lavf/mkv tests/ref/lavf/mpg tests/ref/lavf/ts tests/ref/seek/lavf-asf tests/ref/seek/lavf-mkv tests/ref/seek/lavf-mpg tests/ref/seek/lavf-ts This commit does not change the default ts behaviour, such change will, if its done, be done separately. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-25lavf: introduce AVFMT_TS_NEGATIVELuca Barbato
Most formats do not support negative timestamps, shift them to avoid unexpected behaviour and a number of bad crashes. CC:libav-stable@libav.org Signed-off-by: Anton Khirnov <anton@khirnov.net> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-04-23Read block_align from extradata when decoding qclp in aiff.Carl Eugen Hoyos
Fixes ticket #1287.
2013-04-23avformat: fix orig_pos type to match pkt->posPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-22Merge commit 'a0d5ca4f0a8e2c34d784d503a12af6303424ac6a'Michael Niedermayer
* commit 'a0d5ca4f0a8e2c34d784d503a12af6303424ac6a': mxfenc: Use correct printf format specifier for int64_t h264: Drop unused variable Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-22Merge commit 'b845f5e97b655de0a191f736594777fec9754cf5'Michael Niedermayer
* commit 'b845f5e97b655de0a191f736594777fec9754cf5': riff: Factor out WAVEFORMATEX parsing Conflicts: libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-22Merge commit 'a3bf80a5aea577663354bd538e345b283bcb73de'Michael Niedermayer
* commit 'a3bf80a5aea577663354bd538e345b283bcb73de': riff: Perform full lookup on WAVEFORMATEXTENSIBLE subformat guid Conflicts: libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-22Merge commit 'e544782623caf1eb4b2429e9c4f35d6b627accba'Michael Niedermayer
* commit 'e544782623caf1eb4b2429e9c4f35d6b627accba': riff: Move guid structs and helper functions into riff Conflicts: libavformat/asf.h libavformat/riff.c libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-22mxfenc: Use correct printf format specifier for int64_tDiego Biurrun
libavformat/mxfenc.c:1861:9: warning: format '%lld' expects argument of type 'long long int', but argument 5 has type 'int64_t' [-Wformat]
2013-04-22Merge commit '8e329dba378cef0ff6400c7df9c51da167d5a1f0'Michael Niedermayer
* commit '8e329dba378cef0ff6400c7df9c51da167d5a1f0': riff: check for eof if chunk size and code are 0 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-22Merge commit '1c88617b9421c9af8ae961c05d2381b19c585026'Michael Niedermayer
* commit '1c88617b9421c9af8ae961c05d2381b19c585026': riff: K&R formatting cosmetics Conflicts: libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-21riff: Factor out WAVEFORMATEX parsingLuca Barbato
Makes the code simpler to follow. Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-04-21riff: Perform full lookup on WAVEFORMATEXTENSIBLE subformat guidPeter Ross
Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-04-21riff: Move guid structs and helper functions into riffPeter Ross
Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-04-21riff: check for eof if chunk size and code are 0Luca Barbato
Prevent an infinite loop. Inspired by a patch from Michael Niedermayer CC: libav-stable@libav.org Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-04-21riff: Add ACTRAC3+ guidPeter Ross
Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-04-21riff: K&R formatting cosmeticsLuca Barbato
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-04-21mxf_timestamp_to_str: dont leave uninitilaized fields in time.Michael Niedermayer
Fixes CID1005318 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-20lavf/gif: add final_delay option.Clément Bœsch
2013-04-20lavf/gifdec: add loop support.Clément Bœsch
Loop is ignored by default.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-31 04:00:50 +0300