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-07Merge remote branch 'qatar/master'Michael Niedermayer
* qatar/master: Fix parser: mark av_parser_parse() for removal on next major bump swscale: postpone sws_getContext removal until next major bump. fate: add AAC LATM test mmst: get rid of deprecated AVERRORs lxfdec: use AVERROR(ENOMEM) instead of deprecated AVERROR_NOMEM. Reemove remaining uses of deprecated AVERROR_NOTSUPP. REIMPLEMENTED in 2 lines of code: lavf: if id3v2 tag is present and all else fails, guess by file extension Conflicts: libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-06lavf: if id3v2 tag is present and all else fails, guess by file extensionAnton Khirnov
2011-04-04Merge remote branch 'qatar/master'Michael Niedermayer
* qatar/master: fate: fix partial run when no samples path is specified ARM: NEON fixed-point forward MDCT ARM: NEON fixed-point FFT lavf: bump minor version and add an APIChanges entry for avio changes avio: simplify url_open_dyn_buf_internal by using avio_alloc_context() avio: make url_fdopen internal. avio: make url_open_dyn_packet_buf internal. avio: avio_ prefix for url_close_dyn_buf avio: avio_ prefix for url_open_dyn_buf avio: introduce an AVIOContext.seekable field ac3enc: use generic fixed-point mdct lavfi: add fade filter Change yadif to not use out of picture lines. lavc: deprecate AVCodecContext.antialias_algo lavc: mark mb_qmin/mb_qmax for removal on next major bump. Conflicts: doc/filters.texi libavcodec/ac3enc_fixed.h libavcodec/ac3enc_float.h libavfilter/Makefile libavfilter/allfilters.c libavfilter/vf_fade.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-04avio: introduce an AVIOContext.seekable fieldAnton Khirnov
Use it instead of url_is_streamed and AVIOContext.is_streamed.
2011-04-03Improve codec_tag guessing code.Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-03Fix issue2437Michael Niedermayer
2011-04-03Reimplement stream probe try #2Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-03Partial rewrite stream probe code.Michael Niedermayer
Fix issue2312. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-03lavf: inspect more frames for fps when container time base is coarseAnssi Hannula
As per issue2629, most 23.976fps matroska H.264 files are incorrectly detected as 24fps, as the matroska timestamps usually have only millisecond precision. Fix that by doubling the amount of timestamps inspected for frame rate for streams that have coarse time base. This also fixes 29.970 detection in matroska. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-02Merge remote branch 'qatar/master'Michael Niedermayer
* qatar/master: ac3enc: ARM optimised ac3_compute_matissa_size ac3: armv6 optimised bit_alloc_calc_bap fate: simplify fft test rules avio: document avio_alloc_context. lavf: make compute_chapters_end less picky. sierravmd: fix Indeo3 videos FFT: simplify fft8() fate: add fixed-point fft/mdct tests Fixed-point support in fft-test ape: check that number of seektable entries is equal to number of frames Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-01lavf: make compute_chapters_end less picky.Anton Khirnov
In particular, now it assumes that a) chapters are chronologically ordered b) chapters have the same timebases c) duration of the stream is known and asserts if any of these is not met. Make it properly deal with harsher conditions. fixes issue2320
2011-03-26lavf: make compute_pkt_fields2() return meaningful error valuesStefano Sabatini
2011-03-26Merge remote-tracking branch 'newdev/master'Michael Niedermayer
* newdev/master: mov: set audio service type for AC-3 from bitstream mode in the 'dac3' atom. Get audio_service_type for AC-3 based on bitstream mode in the AC-3 parser and decoder, and vice-versa for the AC-3 encoder. Use audio_service_type to set stream disposition. Add APIchanges entry for audio_service_type. Add audio_service_type field to AVCodecContext for encoding and reporting of the service type in the audio bitstream. configure: in check_ld, place new -l flags before existing ones support @heading, @subheading, @subsubheading, and @subsubsection in texi2pod.pl doc: update build system documentation aacenc: indentation aacenc: fix the side calculation in search_for_ms vp8.c: rename EDGE_* to VP8_EDGE_*. Conflicts: doc/APIchanges libavcodec/avcodec.h libavcodec/version.h libavcodec/vp8.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-25Use audio_service_type to set stream disposition.Justin Ruggles
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-18lavf: fix function name in compute_pkt_fields2 av_dlog messageStefano Sabatini
2011-03-17Revert "replace FFMPEG with LIBAV in FFMPEG_CONFIGURATION"Michael Niedermayer
This reverts commit 29ba091136a5e04574f7bfc1b17536c923958f6f.
2011-03-17Revert "use LIBAV_LICENSE and LIBAV_VERSION instead of FFMPEG_*"Michael Niedermayer
This reverts commit a03be6e1ba4cbf9984b0bbdb674704bbb2da6713.
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: Make make_absolute_url a lavf internal functionMartin Storsjö
This is shared by both applehttp demuxer and protocol. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-03-17lavf: make av_interleave_packet() return meaningful error codesStefano Sabatini
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit c5dcb3d493a6bb73efeb8bfae24f5cc31908201f) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-03-17lavf: enable av_dlog message in av_interleaved_write_frame()Stefano Sabatini
Help debugging timestamp issues. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit d541c8b468c12892fe7b7e655e1ed45e11e2166d) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-03-17lavf: enable av_dlog() in compute_pkt_fields2()Stefano Sabatini
Turns a comment into an av_dlog() instruction, also add a commented issues. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 77f21ce4641b53f3277ba30ca3d009b6250fd9ea) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-03-17avio: make url_setbufsize internal.Anton Khirnov
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-17lavf: make av_interleave_packet() return meaningful error codesStefano Sabatini
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-17lavf: enable av_dlog() in compute_pkt_fields2()Stefano Sabatini
Turns a comment into an av_dlog() instruction, also add a commented issues. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-17lavf: enable av_dlog message in av_interleaved_write_frame()Stefano Sabatini
Help debugging timestamp issues. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-16use LIBAV_LICENSE and LIBAV_VERSION instead of FFMPEG_*Janne Grunau
2011-03-16replace FFMPEG with LIBAV in FFMPEG_CONFIGURATIONJanne Grunau
also update the multiple inclusion guards in config.h|mak
2011-03-15Merge remote-tracking branch 'newdev/master'Michael Niedermayer
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-15Use AVERROR_EXIT with url_interrupt_cb.Nicolas George
Functions interrupted by url_interrupt_cb should not be restarted. Therefore using AVERROR(EINTR) was wrong, as it did not allow to distinguish when the underlying system call was interrupted and actually needed to be restarted. This fixes roundup issues 2657 and 2659 (ffplay not exiting for streamed content). Signed-off-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-15lavf/utils: dont't explicitly check AVIOContext.errorAnton Khirnov
The error should be caught in write_packet()/write_trailer() Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-11Fix av_find_best_stream when providing a wanted streamMarton Balint
In the main loop, stream_number is incremented after checking the stream type, so the search usually will not find the wanted stream. This patch eliminates the useless stream_number variable and introduces a new one, called real_stream_index to store the real stream index of the current stream, no matter if we are looping through all the streams or only the streams of a program. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-11Fix av_find_best_stream when decoder_ret is given and using a related streamMarton Balint
Yet another fix for the code originally designed for use without related_stream. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-08avio: move ff_rewind_with_probe_data from avio.h to avio_internal.hAnton Khirnov
also change its prefix to ffio Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit f1ef2cd9ed22be231bb4da8d2f93d9a0c7877aa7)
2011-03-08avio: avio_ prefix for url_fsizeAnton Khirnov
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 76aa876e69cf78a40821e66dec0a1006e4eb23ec)
2011-03-07avio: move ff_rewind_with_probe_data from avio.h to avio_internal.hAnton Khirnov
also change its prefix to ffio Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-07avio: avio_ prefix for url_fsizeAnton Khirnov
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-03libavformat: Add av_pkt_dump{, _log}2, taking an AVStream parameterMartin Storsjö
This removes a fixme issue, by allowing the av_pkt_dump functions to use the correct time base. Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit 863c471638fa667e6e5c5df059b67af263e1cd40)
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-02libavformat: Add av_pkt_dump{, _log}2, taking an AVStream parameterMartin Storsjö
This removes a fixme issue, by allowing the av_pkt_dump functions to use the correct time base. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-03-01avio: avio_ prefix for url_fseekAnton Khirnov
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-23avio: rename url_fopen/fclose -> avio_open/close.Anton Khirnov
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 22a3212e32b696028e21f00871f3cb48c044029d)
2011-02-23avio: rename url_fopen/fclose -> avio_open/close.Anton 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>