summaryrefslogtreecommitdiff
path: root/libavformat/ffmenc.c
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-01
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * lavf: make av_set_pts_info private.Anton Khirnov2011-11-30
| | | | | | | | It's supposed to be called only from (de)muxers.
| * libx264: add 'direct-pred' private optionAnton Khirnov2011-09-07
| | | | | | | | Deprecate AVCodecContext.directpred
| * libx264: add 'partitions' private optionAnton Khirnov2011-09-07
| | | | | | | | Deprecate AVCodecContext.partitions.
| * Rename ffserver to avserver.Anton Khirnov2011-08-09
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * lavf: use designated initialisers for all (de)muxers.Anton Khirnov2011-07-17
| | | | | | | | It's more readable and less prone to breakage.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ffserver: remove unused variable. Remove unused and outdated TODO file. gitignore: Drop individual .d ignore; it is already covered by a wildcard. lavf: deprecate AVStream.quality. bink: pass Bink version to audio decoder through extradata instead of codec_tag. libpostproc: Remove disabled code. flashsv: improve some comments and fix some wrong ones flashsv: Eliminate redundant variable indirection. flashsv: set reference frame type to full frame flashsv: replace bitstream description by a link to the specification flashsv: convert a debug av_log into av_dlog flashsv: simplify condition flashsv: return more meaningful error values flashsv: cosmetics: break some overly long lines flashsv: cosmetics: drop some unnecessary parentheses swscale: amend documentation to mention use of native depth for scaling. eval: add missing comma to tests. eval: fix memleak. H.264: make loopfilter bS const where applicable Conflicts: libavcodec/binkaudio.c libavformat/bink.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: deprecate AVStream.quality.Anton Khirnov2011-07-06
| | | | | | | | AVStream is no place for it and it's unused outside of ffmpeg anyway.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (40 commits) H.264: template left MB handling H.264: faster fill_decode_caches H.264: faster write_back_* H.264: faster fill_filter_caches H.264: make filter_mb_fast support the case of unavailable top mb Do not include log.h in avutil.h Do not include pixfmt.h in avutil.h Do not include rational.h in avutil.h Do not include mathematics.h in avutil.h Do not include intfloat_readwrite.h in avutil.h Remove return statements following infinite loops without break RTSP: Doxygen comment cleanup doxygen: Escape '\' in Doxygen documentation. md5: cosmetics md5: use AV_WL32 to write result md5: add fate test md5: include correct headers md5: fix test program doxygen: Drop array size declarations from Doxygen parameter names. doxygen: Fix parameter names to match the function prototypes. ... Conflicts: libavcodec/x86/dsputil_mmx.c libavformat/flvenc.c libavformat/oggenc.c libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Do not include intfloat_readwrite.h in avutil.hMans Rullgard2011-07-03
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
|/ | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* avio: rename put_flush_packet -> avio_flushAnton Khirnov2011-03-16
| | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* avio: add avio_tell macro as a replacement for url_ftellAnton Khirnov2011-03-04
| | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* avio: avio: avio_ prefixes for put_* functionsAnton Khirnov2011-02-21
| | | | | | | | | | | | In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* avio: rename ByteIOContext to AVIOContext.Anton Khirnov2011-02-20
| | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.Diego Elio Pettenò2011-01-26
| | | | | 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.
* avio: add av_put_str and deprecate put_strz in favor of itAnton Khirnov2011-01-21
| | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY.Jean-Daniel Dupas2010-03-31
| | | | | | Patch by Jean-Daniel Dupas, devlists shadowlab org Originally committed as revision 22744 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Define AVMediaType enum, and use it instead of enum CodecType, whichStefano Sabatini2010-03-30
| | | | | | is deprecated and will be dropped at the next major bump. Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix breakage introduced by setting the sample_fmt to SAMPLE_FMT_NONE ↵Benjamin Larsson2009-12-14
| | | | | | | | (r20623). This makes streaming to ffserver work again. Originally committed as revision 20869 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Update ffserver to include all basic x264 parameters in .ffm files.Jason Garrett-Glaser2009-11-24
| | | | Originally committed as revision 20601 to svn://svn.ffmpeg.org/ffmpeg/trunk
* do not write ffm write index by default, detect if file is being written and ↵Baptiste Coudurier2009-03-20
| | | | | | return EOF Originally committed as revision 18063 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: Remove pointless period after copyright statement non-sentences.Diego Biurrun2009-01-19
| | | | Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix build: Add intreadwrite.h and bswap.h #includes where necessary.Diego Biurrun2009-01-11
| | | | Originally committed as revision 16556 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix rc_eq mem leak.Michael Niedermayer2008-08-16
| | | | Originally committed as revision 14788 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Improve long names for FFM muxer and demuxer:Stefano Sabatini2008-07-27
| | | | | | change "ffm format" to "FFM (FFserver live feed) format". Originally committed as revision 14438 to svn://svn.ffmpeg.org/ffmpeg/trunk
* fix size of header dataStefan Gehrer2008-06-27
| | | | Originally committed as revision 14015 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics, pts->dtsBaptiste Coudurier2008-06-22
| | | | Originally committed as revision 13881 to svn://svn.ffmpeg.org/ffmpeg/trunk
* store dts in ffm headersBaptiste Coudurier2008-06-22
| | | | Originally committed as revision 13880 to svn://svn.ffmpeg.org/ffmpeg/trunk
* remove pts set hack, this is no more correctBaptiste Coudurier2008-06-22
| | | | Originally committed as revision 13879 to svn://svn.ffmpeg.org/ffmpeg/trunk
* enable feeder threadsBaptiste Coudurier2008-06-22
| | | | Originally committed as revision 13868 to svn://svn.ffmpeg.org/ffmpeg/trunk
* do not reset ffm pts, this avoids setting last pts to 0 and screwing up seekingBaptiste Coudurier2008-06-22
| | | | Originally committed as revision 13856 to svn://svn.ffmpeg.org/ffmpeg/trunk
* remove now unneeded varsBaptiste Coudurier2008-06-09
| | | | Originally committed as revision 13726 to svn://svn.ffmpeg.org/ffmpeg/trunk
* pass dts and pts through ffm, should fix streaming b framesBaptiste Coudurier2008-06-09
| | | | Originally committed as revision 13725 to svn://svn.ffmpeg.org/ffmpeg/trunk
* pass extradata through ffmBaptiste Coudurier2008-06-09
| | | | Originally committed as revision 13721 to svn://svn.ffmpeg.org/ffmpeg/trunk
* remove ugly ffm_nopts hack, use AVFormatContext->timestampBaptiste Coudurier2008-06-09
| | | | Originally committed as revision 13718 to svn://svn.ffmpeg.org/ffmpeg/trunk
* fix pts handling in ffmBaptiste Coudurier2008-06-07
| | | | Originally committed as revision 13683 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics, rename first to header, more explicit nameBaptiste Coudurier2008-06-06
| | | | Originally committed as revision 13676 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.Stefano Sabatini2008-06-03
| | | | | | | 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
* remove unneeded includeBaptiste Coudurier2008-05-26
| | | | Originally committed as revision 13414 to svn://svn.ffmpeg.org/ffmpeg/trunk
* split ffm de/muxerBaptiste Coudurier2008-05-26
Originally committed as revision 13413 to svn://svn.ffmpeg.org/ffmpeg/trunk
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-28 20:42:41 +0000