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
2012-04-07Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: cosmetics: Align muxer/demuxer declarations mpeg12: Do not change frame_pred_frame_dct flag and demote error into a warning avcodec: remove avcodec_guess_channel_layout() avutil: Add av_get_default_channel_layout() Conflicts: doc/APIchanges libavcodec/mpeg12.c libavformat/cdg.c libavformat/matroskaenc.c libavformat/mpegts.c libavformat/nuv.c libavformat/wav.c libavutil/audioconvert.c libavutil/audioconvert.h libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-06cosmetics: Align muxer/demuxer declarationsMartin Storsjö
Also add missing trailing commas, break long codec_tag lines and add spaces in codec_tag declarations. Signed-off-by: Martin Storsjö <martin@martin.st>
2012-01-28Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (71 commits) movenc: Allow writing to a non-seekable output if using empty moov movenc: Support adding isml (smooth streaming live) metadata libavcodec: Don't crash in avcodec_encode_audio if time_base isn't set sunrast: Document the different Sun Raster file format types. sunrast: Add a check for experimental type. libspeexenc: use AVSampleFormat instead of deprecated/removed SampleFormat lavf: remove disabled FF_API_SET_PTS_INFO cruft lavf: remove disabled FF_API_OLD_INTERRUPT_CB cruft lavf: remove disabled FF_API_REORDER_PRIVATE cruft lavf: remove disabled FF_API_SEEK_PUBLIC cruft lavf: remove disabled FF_API_STREAM_COPY cruft lavf: remove disabled FF_API_PRELOAD cruft lavf: remove disabled FF_API_NEW_STREAM cruft lavf: remove disabled FF_API_RTSP_URL_OPTIONS cruft lavf: remove disabled FF_API_MUXRATE cruft lavf: remove disabled FF_API_FILESIZE cruft lavf: remove disabled FF_API_TIMESTAMP cruft lavf: remove disabled FF_API_LOOP_OUTPUT cruft lavf: remove disabled FF_API_LOOP_INPUT cruft lavf: remove disabled FF_API_AVSTREAM_QUALITY cruft ... Conflicts: doc/APIchanges libavcodec/8bps.c libavcodec/avcodec.h libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/options.c libavcodec/sunrast.c libavcodec/utils.c libavcodec/version.h libavcodec/x86/h264_deblock.asm libavdevice/libdc1394.c libavdevice/v4l2.c libavformat/avformat.h libavformat/avio.c libavformat/avio.h libavformat/aviobuf.c libavformat/dv.c libavformat/mov.c libavformat/utils.c libavformat/version.h libavformat/wtv.c libavutil/Makefile libavutil/file.c libswscale/x86/input.asm libswscale/x86/swscale_mmx.c libswscale/x86/swscale_template.c tests/ref/lavf/ffm Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-27lavf: remove AVFormatParameters from AVFormatContext.read_header signatureAnton Khirnov
2011-12-01Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: rtpdec: Templatize the code for different g726 bitrate variants rv40: move loop filter to rv34dsp context lavf: make av_set_pts_info private. rtpdec: Add support for G726 audio rtpdec: Add an init function that can do custom codec context initialization avconv: make copy_tb on by default. matroskadec: don't set codec timebase. rmdec: don't set codec timebase. avconv: compute next_pts from input packet duration when possible. lavf: estimate frame duration from r_frame_rate. avconv: update InputStream.pts in the streamcopy case. Conflicts: avconv.c libavdevice/alsa-audio-dec.c libavdevice/bktr.c libavdevice/fbdev.c libavdevice/libdc1394.c libavdevice/oss_audio.c libavdevice/v4l.c libavdevice/v4l2.c libavdevice/vfwcap.c libavdevice/x11grab.c libavformat/au.c libavformat/eacdata.c libavformat/flvdec.c libavformat/mpegts.c libavformat/mxfenc.c libavformat/rtpdec_g726.c libavformat/wtv.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-30lavf: make av_set_pts_info private.Anton Khirnov
It's supposed to be called only from (de)muxers.
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-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-13Improve PVA probe function.Reimar Döffinger
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-07-17Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: ffmpeg: fix some indentation ffmpeg: fix operation with --disable-avfilter simple_idct: remove disabled code motion_est: remove disabled code vc1: remove disabled code fate: separate lavf-mxf_d10 test from lavf-mxf cabac: Move code only used in the cabac test program to cabac.c. ffplay: warn that -pix_fmt is no longer working, suggest alternative ffplay: warn that -s is no longer working, suggest alternative lavf: rename enc variable in utils.c:has_codec_parameters() lavf: use designated initialisers for all (de)muxers. wav: remove a use of deprecated AV_METADATA_ macro rmdec: remove useless ap parameter from rm_read_header_old() dct-test: remove write-only variable des: fix #if conditional around P_shuffle Use LOCAL_ALIGNED in ff_check_alignment() Conflicts: ffmpeg.c libavformat/avidec.c libavformat/matroskaenc.c libavformat/mp3enc.c libavformat/oggenc.c libavformat/utils.c tests/ref/lavf/mxf Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-17lavf: use designated initialisers for all (de)muxers.Anton Khirnov
It's more readable and less prone to breakage.
2011-03-19Replace FFmpeg with Libav in licence headersMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
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-04avio: add avio_tell macro as a replacement for url_ftellAnton Khirnov
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
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-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>
2011-01-27Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.Diego Elio Pettenò
This also lists the objects from those two libraries as internal (by adding the ff_ prefix) so that they can then be hidden via linker scripts.
2010-03-31Define AVMediaType enum, and use it instead of enum CodecType, whichStefano Sabatini
is deprecated and will be dropped at the next major bump. Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-27technically mp2 in pva needs AVSTREAM_PARSE_FULLBaptiste Coudurier
Originally committed as revision 18966 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-23avoid possibly uninitialized return valueIvo van Poorten
(found by clang static analyzer) Originally committed as revision 18669 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-03Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.Stefano Sabatini
patch by Stefano Sabatini, stefano.sabatini-lala poste.it along with some spelling/consistency fixes for the long names by me Originally committed as revision 13649 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-08Implement read_timestamp and enable seeking in PVA files.Ivo van Poorten
Originally committed as revision 11455 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-08cosmeticsIvo van Poorten
Originally committed as revision 11454 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-08remove unnecessary checkIvo van Poorten
Originally committed as revision 11453 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-08use ff_parse_pes_pts for parsing an MPEG-PES timestampIvo van Poorten
Originally committed as revision 11452 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-06cosmetics, superfluous spaceIvo van Poorten
Originally committed as revision 11430 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-06proper check for valid pva_ptsIvo van Poorten
Originally committed as revision 11429 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-06do not return an error, but warn and recover when encountering an audio packetIvo van Poorten
that should countain a signaled mpeg-pes packet. Originally committed as revision 11428 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-06validate streamid before useIvo van Poorten
Originally committed as revision 11427 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-06change audio codec id to mp2Ivo van Poorten
Originally committed as revision 11426 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-06proper type and initialization of pva_ptsIvo van Poorten
Originally committed as revision 11425 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-06remove unnecessary shiftIvo van Poorten
Originally committed as revision 11424 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-02TechnoTrend PVA DemuxerIvo van Poorten
Originally committed as revision 11371 to svn://svn.ffmpeg.org/ffmpeg/trunk