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-10-29Some minor spelling fixes.Reimar Döffinger
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-10-29Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (53 commits) probe: Restore identification of files with very large id3 tags and no extension. probe: Remove id3 tag presence as a criteria to do file extension checking. mpegts: MP4 SL support mpegts: MP4 OD support mpegts: Add support for Sections in PMT mpegts: Replace the MP4 descriptor parser with a recursive parser. mpegts: Add support for multiple mp4 descriptors mpegts: Parse mpeg2 SL descriptors. isom: Add MPEG4SYSTEMS dummy object type indication. aacdec: allow output reconfiguration on channel changes nellymoserenc: take float input samples instead of int16 nellymoserdec: use dsp functions for overlap and windowing nellymoserdec: do not fail if there is extra data in the packet nellymoserdec: fail if output buffer is too small nellymoserdec: remove pointless buffer size check. lavf: add init_put_byte() to the list of visible symbols. seek-test: free options dictionary after use snow: do not draw_edge if emu_edge is set tools/pktdumper: update to recent avformat api seek-test: update to recent avformat api ... Conflicts: doc/APIchanges libavcodec/mpegaudiodec.c libavcodec/nellymoserdec.c libavcodec/snow.c libavcodec/version.h libavcodec/wmadec.c libavformat/avformat.h libavformat/mpegts.c libavformat/mxfdec.c libavformat/utils.c libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-29mpegts: MP4 SL supportAlex Converse
2011-10-29mpegts: MP4 OD supportAlex Converse
2011-10-29mpegts: Add support for Sections in PMTAlex Converse
2011-10-29mpegts: Replace the MP4 descriptor parser with a recursive parser.Alex Converse
2011-10-29mpegts: Add support for multiple mp4 descriptorsAlex Converse
2011-10-29mpegts: Parse mpeg2 SL descriptors.Alex Converse
2011-10-28lavf: make some seeking functions privateAnton Khirnov
Specifically av_update_cur_dts(), av_seek_frame_binary() and av_gen_search(). They are not supposed to be called outside lavf.
2011-10-27mpegts: Fix detection of some raw AACMichael Niedermayer
Fixes Ticket577 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-24mpegts: add BDMV secondary audio stream typesHendrik Leppkes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-24mpegts: fix null-pointer dereferenceHendrik Leppkes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-22mpegts: remove read_seek()Michael Niedermayer
Its redundant Found-by: nevcairiel Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-21mpegts: cache information to speed up seeking.Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-21mpegts: assert position in dts reading code.Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-21mpegts: add and use mpegts_get_dts()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-21mpegts: fix type of argument of mpegts_resync()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-20Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: presets: rename presets directory lavc: make avcodec_get_context_defaults3 "officially" public lavf: replace av_new_stream->avformat_new_stream part II. lavf,lavd: replace av_new_stream->avformat_new_stream part I. lavf: add avformat_new_stream as a replacement for av_new_stream. Use correct scaling table for bwd-pred MVs in second B-field Ut Video decoder Makefile: change presets extension to .avpreset lavfi: add rgbtestsrc source, ported from MPlayer libmpcodecs lavfi: add testsrc source AVOptions: add documentation. presets: update libx264 ffpresets Conflicts: Changelog doc/APIchanges doc/ffmpeg.texi ffpresets/libx264-ipod320.ffpreset ffpresets/libx264-ipod640.ffpreset ffserver.c libavcodec/avcodec.h libavcodec/options.c libavcodec/version.h libavdevice/libdc1394.c libavfilter/avfilter.h libavfilter/vsrc_testsrc.c libavformat/flvdec.c libavformat/riff.c libavformat/version.h libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-20mpegts: do not return from ff_mpegts_parse_packet() after having seen the ↵Laurent Aimar
first PMT It prevents leaving the AVPacket uninitialized. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-20mpegts: fix return value when enough ts packets have been parsed or when the ↵Laurent Aimar
first PMT has been seen. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-19lavf: replace av_new_stream->avformat_new_stream part II.Anton Khirnov
Manual replacements are done in this commit. In many cases, the id is some constant made up number (e.g. 0 for video and 1 for audio), which is then not used in the demuxer for anything. Those ids are removed.
2011-10-19lavf,lavd: replace av_new_stream->avformat_new_stream part I.Anton Khirnov
Trivial replacements with sed are done in this commit: sed 's/av_new_stream(\([^)]*\), 0)/avformat_new_stream(\1, NULL)/'
2011-10-13Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (31 commits) tiffenc: initialize forgotten avctx. avplay: free the active audio packet at exit. avplay: free rdft data used for spectrogram analysis. log.h: make AVClass a named struct fix ac3 encoder documentation vc1: more prettyprinting cosmetics vc1: prettyprint some tables vc1: K&R formatting cosmetics AVOptions: bump minor and add APIchanges entry. cmdutils/avtools: simplify show_help() by using av_opt_child_class_next() AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_* Remove all uses of deprecated AVOptions API. AVOptions: add av_opt_next, deprecate av_next_option. AVOptions: add functions for evaluating option strings. AVOptions: split get_number(). AVOptions: add av_opt_get*, deprecate av_get*. AVOptions: add av_opt_set*(). AVOptions: add new API for enumerating children. rv34: move inverse transform functions to DSP context flvenc: Write the right metadata entry count ... Conflicts: avconv.c cmdutils.c doc/APIchanges ffplay.c ffprobe.c libavcodec/ac3dec.c libavcodec/h264.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/mpeg12enc.c libavcodec/options.c libavdevice/libdc1394.c libavdevice/v4l2.c libavfilter/vf_drawtext.c libavformat/flvdec.c libavformat/mpegtsenc.c libavformat/options.c libavutil/avutil.h libavutil/opt.c libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-12AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_*Anton Khirnov
2011-10-10mpegts: reduce av_log level for seek back to begin on unseekable protocols ↵Michael Niedermayer
to info level. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-10mpegts: Attempt to seek back to beginning in non-seekable mpegts files.Petter Ericson
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-10Be less verbose about continuity check errors.Carl Eugen Hoyos
2011-09-21Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: swfdec: Add support for sample_rate_code 0 (5512 Hz) dct-test: factor out some common code and do whas was likely intended doc: library versions need to be bumped in version.h Revert "ffmpeg: get rid of useless AVInputStream.nb_streams." Remove some forgotten AVCodecContext.palctrl usage. lavc/utils: move avcodec_init() higher in the file. lavc: replace some deprecated FF_*_TYPE with AV_PICTURE_TYPE_* ac3dec: actually use drc_scale private option lavc: undeprecate AVPALETTE_SIZE and AVPALETTE_COUNT macros alsa: add missing header msmpeg4: remove leftover unused debug variable declaration Fix assert() calls that need updates after FF_COMMON_FRAME macro elimination. Fix av_dlog invocations with wrong or missing logging context. vf_yadif: add support to yuva420p vf_yadif: correct documentation on the parity parameter vf_yadif: copy buffer properties like aspect for second frame as well oma: support for encrypted files id3v2: add support for non-text and GEOB type tag frames des: add possibility to calculate DES-CBC-MAC with small buffer Conflicts: ffmpeg.c libavcodec/dct-test.c libavformat/mpegts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-21Fix av_dlog invocations with wrong or missing logging context.Diego Biurrun
This fixes build failures with -DDEBUG in CPPFLAGS.
2011-09-16mpegts: make sure the "standard" code doesnt override the probing with ↵Michael Niedermayer
NONE/DATA. Fixes video stream detection in vid_0x80.ts Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-14make mpegts_get_pcr resync if it's not on a valid mpegts packetelupus
2011-09-14cosmetic reindent of mpegts_get_pcrelupus
2011-09-14check return value of url_fseek in mpegts_get_pcrelupus
2011-09-14respect the maximum position mpegts_get_pcr is allowed to seek toelupus
2011-09-14remove unused code in mpegts_get_pcrelupus
2011-09-12Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (31 commits) audioconvert: add explanatory comments to channel_names array audioconvert: K&R whitespace cosmetics avconv: use correct index when selecting metadata to write to. avconv: fix inverted variable doc/avconv: document option types (input/output/per-stream/...) doc/avtools-common-opts: write a section about stream specifiers. doc/avconv: remove two pointless paragraphs. doc/avconv: document that global options should be specified first. doc/avconv: remove entries for nonexistent options doc/avconv: remove documentation for removed 'timestamp' option doc: cosmetics, rename fftools-common-opts to avtools-.... avconv: move streamid_map to options context. avconv: extend -vf syntax avconv: move top_field_first to options context. avconv: move inter/intra matrix to options context. avconv: remove -psnr option. avconv: remove me_threshold option. avconv: move video_rc_override_string to options context. avconv: move frame pixel format to the options context. avconv: move frame aspect ratio to the options context. ... Conflicts: avconv.c cmdutils_common_opts.h doc/avconv.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-11mpegts: When playing mpegts over rtp/rtsp/sdp, lavf must still read PAT/SDT ↵Joakim Plate
to get available streams The code path using for mpegts over rtp doesn't open the demuxer using mpegts_read_header, so it never starts listening for PAT/SDT, only uses auto_guess Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-11mpegts: improve error reportingGeorgi Chorbadzhiyski
When reporting continuity error show pid, expected and received cc. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-09-11mpegts: on seek, reset the cc for all PIDsAviad Rozenhek
Prevent false positive continuity counter error logs. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-09-11mpegts: update comment to match codeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-11mpegts: Some additional HDMV types and reg descriptors for mpegtsJoakim Plate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-30Only autodetect loas in transport streams.Carl Eugen Hoyos
The Makito encoder sets stream type 0x11 for AAC. This patch should be reverted if it breaks decoding valid streams (and the problem can't be fixed in the probe function).
2011-08-26Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: vp6: partially propagate huffman tree building errors during coeff model parsing and fix misspelling mpeg12: propagate chunk decode errors and fix conditional indentation vc1: fix VC-1 Pulldown handling. VC1: Fix first/last row checks with slices mp4: Handle non-trivial ES Descriptors. vc1: properly zero coded_block[] edges on new slice entry. Conflicts: libavcodec/vc1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-25mp4: Handle non-trivial ES Descriptors.Alex Converse
2011-08-16mpegts: log into an AVFormatContext rather than MpegTSContext.Alex Converse
MpegTSContext's AVClass member can be NULL.
2011-08-16Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: Fix NASM include directive dsputil_mmx: Honor HAVE_AMD3DNOW lavf,lavd: remove all usage of AVFormatParameters from demuxers. jack: add 'channels' private option. VC-1: fix reading of custom PAR. Remove redundant and dubious video codec detection by its extradata mpeg12: remove repeat-field code disabled since May 2002 patch checklist: suggest fate instead of regression tests Turn on resampling on sudden size change instead of bailing out during recode. avtools: reinitialise filter chain when input video stream changes dimensions Conflicts: Makefile avconv.c doc/developer.texi ffplay.c libavcodec/x86/dsputil_mmx.c libavdevice/libdc1394.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-15lavf,lavd: remove all usage of AVFormatParameters from demuxers.Anton Khirnov
AVFormatParameters are converted into corresponding private options in av_open_input_file/stream() compat wrappers, so accessing them from demuxers is redundant.
2011-08-10Always pass a AVFormatContext to av_log.Reimar Döffinger
This is consistent, allows custom handlers to print more info (since they probably know about the AVFormatContext class but not a demuxer-specific one) and also avoids issues due to the class pointer being NULL for non-raw mpegts. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-08-03Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: Revert "swscale: use 15-bit intermediates for 9/10-bit scaling." swscale: use 15-bit intermediates for 9/10-bit scaling. dct32: Add SSE2 ASM optimizations Correct chroma vector calculation for RealVideo 3. lavf: Add an option to discard corrupted frames mpegts: Mark wrongly-sized packets as corrupted mpegts: Move scan test to handle_packets mpegts: Mark corrupted packets mpegts: Reset continuity counter on seek mpegts: Fix for continuity counter mpegts: Silence "can't seek" warning on unseekable apichange: add an entry for AV_PKT_FLAG_CORRUPT avpacket: signal possibly corrupted packets mpeg4videodec: remove dead code that would have detected erroneous encoding aac: Remove some suspicious illegal memcpy()s from LTP. bink: Eliminate unnecessary shadow declaration. Conflicts: doc/APIchanges libavcodec/version.h libavformat/avformat.h libavformat/options.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-02mpegts: Mark wrongly-sized packets as corruptedZohar Kelrich
Signed-off-by: Zohar Kelrich <lumimies@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>