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
2011-04-07move ff_asf_guid, ff_guidcmp and ff_get_guid into riff.hPeter Ross
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-03Reimplement stream probe try #2Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-24Merge remote-tracking branch 'newdev/master'Michael Niedermayer
* newdev/master: avio: make udp_set_remote_url/get_local_port internal. asfdec: also subtract preroll when reading simple index object matroskaenc: remove a variable that's unused after bc17bd9. avio: cosmetics - nicer vertical alignment. Remove unnecessary icc version checks Disable 'attribute "foo" ignored' warnings from icc rtsp: Don't use a locale dependent format string Add xd55 codec tag for XDCAM HD422 720p25 CBR files. configure: get libavcodec version from new version.h header lavc: move the version macros to a new installed header. matroskaenc: simplify get_aac_sample_rates by using ff_mpeg4audio_get_config Do not use format string "%0.3f" for RTSP Range field. Add apply_window_int16() to DSPContext with x86-optimized versions and use it in the ac3_fixed encoder. Document usage of import libraries created by dlltool configure: Set the correct lib target for arm/wince dlltool fate: simplify regression-funcs.sh fate: add support for multithread testing Conflicts: libavformat/rtspdec.c libavutil/attributes.h libavutil/internal.h libavutil/mem.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-23asfdec: also subtract preroll when reading simple index objectVladimir Pantelic
This was missed when ASF was changed to return timestamps without preroll. Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-23Merge remote-tracking branch 'newdev/master'Michael Niedermayer
* newdev/master: (33 commits) Fix an infinite loop when RoQ encoded generated a frame with a size greater than the maximum valid size. Add kbdwin.o to AC3 decoder Detect byte-swapped AC-3 and support decoding it directly. cosmetics: indentation Always copy input data for AC3 decoder. ac3enc: make sym_quant() branch-free cosmetics: indentation Add a CPU flag for the Atom processor. id3v2: skip broken tags with invalid size id3v2: don't explicitly skip padding Make sure kbhit() is in conio.h fate: update wmv8-drm reference vc1: make P-frame deblock filter bit-exact. configure: Add the -D parameter to the dlltool command amr: Set the AVFMT_GENERIC_INDEX flag amr: Set the pkt->pos field properly to the start of the packet amr: Set the codec->bit_rate field based on the last packet rtsp: Specify unicast for TCP interleaved streams, too Set the correct target for mingw64 dlltool applehttp: Change the variable for stream position in seconds into int64_t ... Conflicts: ffmpeg.c ffplay.c libavcodec/ac3dec.c libavformat/avio.h libavformat/id3v2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-21avio: make av_url_read_fseek/fpause internal.Anton Khirnov
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-19Replace FFmpeg with Libav in licence headersMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-18reverts parts of commit de11ee906ed232157392924735c18ab7d8522ccb. The author ↵Michael Niedermayer
of this patch has a poor understanding of the code
2011-03-18Merge remote-tracking branch 'newdev/master'Michael Niedermayer
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-17asfdec: subtract the preroll value and thus output 0 based timestampsVladimir Pantelic
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-17Merge remote-tracking branch 'newdev/master'Michael Niedermayer
Conflicts: Changelog doc/APIchanges doc/optimization.txt libavformat/avio.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-17lavf: replace avio_seek(SEEK_CUR) with avio_skip where it makes senseAnton Khirnov
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-15Merge remote-tracking branch 'newdev/master'Michael Niedermayer
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-15avio: deprecate url_ferrorAnton Khirnov
AVIOContext.error should be used directly instead. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-08avio: deprecate url_feofAnton Khirnov
AVIOContext.eof_reached should be used directly instead. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-05avio: add avio_tell macro as a replacement for url_ftellAnton Khirnov
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit a2704c9712ad35cc22e7e0d8a79b581c07fa383b)
2011-03-04avio: add avio_tell macro as a replacement for url_ftellAnton Khirnov
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-03lavf: replace all uses of url_fskip with avio_seekAnton Khirnov
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit e356fc57a2e9887370caec58d8aafeafd1f336dc)
2011-03-03avio: avio_ prefix for url_fseekAnton Khirnov
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 6b4aa5dac8f41aa452d0ce9a1bede9e59a303060)
2011-03-01lavf: replace all uses of url_fskip with avio_seekAnton Khirnov
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-01avio: avio_ prefix for url_fseekAnton Khirnov
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-22avio: avio_ prefixes for get_* functionsAnton Khirnov
In the name of consistency: get_byte -> avio_r8 get_<type> -> avio_r<type> get_buffer -> avio_read get_partial_buffer will be made private later get_strz is left out becase I want to change it later to return something useful. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit b7effd4e8338f6ed5bda630ad7ed0809bf458648)
2011-02-21avio: avio_ prefixes for get_* functionsAnton Khirnov
In the name of consistency: get_byte -> avio_r8 get_<type> -> avio_r<type> get_buffer -> avio_read get_partial_buffer will be made private later get_strz is left out becase I want to change it later to return something useful. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20avio: rename ByteIOContext to AVIOContext.Anton Khirnov
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit ae628ec1fd7f54c102bf9e667a3edd404b9b9128)
2011-02-20avio: rename ByteIOContext to AVIOContext.Anton Khirnov
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-15asfdec: fix build for big endian targetsMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit aabc2682fcb70417abda0e78d27a425269a82fc8)
2011-02-15asfdec: split reading stream properties out of asf_read_header()Anton Khirnov
This contains a rename from gsize->size Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 8bf6db1b29f3766732e2bb2bdd2681318fd8e215)
2011-02-14asfdec: fix build for big endian targetsMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-14asfdec: don't export empty metadataAnton Khirnov
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-14asfdec: split reading stream properties out of asf_read_header()Anton Khirnov
This contains a rename from gsize->size Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-11asfdec: deobfuscate reading video properties sizeAnton Khirnov
This code will be later split out into a function which takes a 'size' argument, so I'm keeping the name 'sizeX' here. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 0b1d291a716dd79ca6862a95baf9ac574feba885)
2011-02-11asfdec: split asf_read_header()Anton Khirnov
Only trivial splits are done here -- i.e. copy/paste + reindent + missing variable declarations. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit c1fea2307011ac7a7bb98af98010f81abc789732)
2011-02-11asfdec: skip the stream bitrate listAnton Khirnov
Its contents aren't used for anything. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit d7a5106eb2dad33765b0e5f11fd8b1a87e5a9b4b)
2011-02-11asfdec: use an ASFContext array for storing stream bitratesAnton Khirnov
This will be useful for splitting asf_read_header() Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 7c7253802bbb4f7330ff9b32358bf05f9880cbdf)
2011-02-11asfdec: move DAR list to ASFContextAnton Khirnov
This will be useful for splitting asf_read_header() Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit d42b09723ed154d5269b95efcc20cb1874f60816)
2011-02-11asfdec: remove some write-only values from the contextAnton Khirnov
Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 569ff02168dfe618599db5d5a327caf8b3051dd5)
2011-02-11asf: split ASFContext into muxer and demuxer parts.Anton Khirnov
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 4bc328a2bdf96d01afd3cf4532efb9db41f00985)
2011-02-11asf: make ff_guidcmp inline and move it to asf.hAnton Khirnov
Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit e4e234fad77daa8628fc56155563248165d51ab4)
2011-02-11asfdec: deobfuscate reading video properties sizeAnton Khirnov
This code will be later split out into a function which takes a 'size' argument, so I'm keeping the name 'sizeX' here. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-11asfdec: split asf_read_header()Anton Khirnov
Only trivial splits are done here -- i.e. copy/paste + reindent + missing variable declarations. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-10asfdec: skip the stream bitrate listAnton Khirnov
Its contents aren't used for anything. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-10asfdec: use an ASFContext array for storing stream bitratesAnton Khirnov
This will be useful for splitting asf_read_header() Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-10asfdec: move DAR list to ASFContextAnton Khirnov
This will be useful for splitting asf_read_header() Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-10asfdec: remove some write-only values from the contextAnton Khirnov
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-09asf: split ASFContext into muxer and demuxer parts.Anton Khirnov
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-09asf: make ff_guidcmp inline and move it to asf.hAnton Khirnov
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-30Replace dprintf with av_dlogLuca Barbato
dprintf clashes with POSIX.1-2008 (cherry picked from commit dfd2a005eb29e4b9f2fdb97036eb7d5c38ae4bd4)
2011-01-30asfdec: ensure that the whole tag is read.Anton Khirnov
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net> (cherry picked from commit 042950542d6ee70fde01e4edbb6e6da38ebbaf27)
2011-01-30Replace dprintf with av_dlogLuca Barbato
dprintf clashes with POSIX.1-2008
2011-01-28asfdec: ensure that the whole tag is read.Anton Khirnov
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>