aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/swfenc.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-061-5/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (31 commits) cdxl demux: do not create packets with uninitialized data at EOF. Replace computations of remaining bits with calls to get_bits_left(). amrnb/amrwb: Remove get_bits usage. cosmetics: reindent avformat: do not require a pixel/sample format if there is no decoder avformat: do not fill-in audio packet duration in compute_pkt_fields() lavf: Use av_get_audio_frame_duration() in get_audio_frame_size() dca_parser: parse the sample rate and frame durations libspeexdec: do not set AVCodecContext.frame_size libopencore-amr: do not set AVCodecContext.frame_size alsdec: do not set AVCodecContext.frame_size siff: do not set AVCodecContext.frame_size amr demuxer: do not set AVCodecContext.frame_size. aiffdec: do not set AVCodecContext.frame_size mov: do not set AVCodecContext.frame_size ape: do not set AVCodecContext.frame_size. rdt: remove workaround for infinite loop with aac avformat: do not require frame_size in avformat_find_stream_info() for CELT avformat: do not require frame_size in avformat_find_stream_info() for MP1/2/3 avformat: do not require frame_size in avformat_find_stream_info() for AAC ... Conflicts: doc/APIchanges libavcodec/Makefile libavcodec/avcodec.h libavcodec/h264.c libavcodec/h264_ps.c libavcodec/utils.c libavcodec/version.h libavcodec/x86/dsputil_mmx.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * swfenc: use av_get_audio_frame_duration() instead of AVCodecContext.frame_sizeJustin Ruggles2012-03-051-5/+1
| | | | | | | | | | This way we can do stream copy without having the demuxer wait until frame_size has been set.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-171-20/+19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-171-20/+19
| | | | | | | | It's more readable and less prone to breakage.
* | Fix some passing argument from incompatible pointer type warnings.Michael Niedermayer2011-04-241-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-041-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * avio: introduce an AVIOContext.seekable fieldAnton Khirnov2011-04-031-1/+1
| | | | | | | | Use it instead of url_is_streamed and AVIOContext.is_streamed.
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
|/ | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* avio: rename put_flush_packet -> avio_flushAnton Khirnov2011-03-161-3/+3
| | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* avio: add avio_tell macro as a replacement for url_ftellAnton Khirnov2011-03-041-5/+5
| | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* avio: avio_ prefix for url_fseekAnton Khirnov2011-03-011-6/+6
| | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* lavf: replace remaining uses of put_tag with avio_writeAnton Khirnov2011-02-251-2/+2
| | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* avio: avio: avio_ prefixes for put_* functionsAnton Khirnov2011-02-211-54/+54
| | | | | | | | | | | | 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-201-7/+7
| | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.Diego Elio Pettenò2011-01-261-2/+2
| | | | | 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.
* Define AVMediaType enum, and use it instead of enum CodecType, whichStefano Sabatini2010-03-301-3/+3
| | | | | | is deprecated and will be dropped at the next major bump. Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add ff_ prefixes to exported symbols in libavformat/riff.h.Daniel Verkamp2009-06-221-1/+1
| | | | | | patch by Daniel Verkamp, aniel drv nu Originally committed as revision 19254 to svn://svn.ffmpeg.org/ffmpeg/trunk
* check av_fifo_alloc returnBaptiste Coudurier2009-05-211-0/+2
| | | | Originally committed as revision 18892 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename pbBufPtr() to put_bits_ptr().Stefano Sabatini2009-04-131-3/+3
| | | | | | | The new name is more readable and consistent with the FFmpeg naming style. Originally committed as revision 18497 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Split bitstream.h, put the bitstream writer stuff in the new fileStefano Sabatini2009-04-121-1/+1
| | | | | | put_bits.h. Originally committed as revision 18461 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Reorder arguments for av_fifo_generic_read to be more logical andReimar Döffinger2009-03-091-1/+1
| | | | | | consistent with av_fifo_generic_write. Originally committed as revision 17914 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Allocate AVFifoBuffer through the fifo API to reduce future API/ABI issues.Michael Niedermayer2009-03-081-7/+7
| | | | | | | Yes this breaks ABI/API but ive already broken it and will bump avutil major soon. Originally committed as revision 17869 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove const qualifier from function argument to eliminate the warningDiego Biurrun2009-02-081-1/+1
| | | | | | swfenc.c:452: warning: passing argument 2 of #av_fifo_generic_write# discards qualifiers from pointer target type Originally committed as revision 17036 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: Remove pointless period after copyright statement non-sentences.Diego Biurrun2009-01-191-2/+2
| | | | Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Change semantic of CONFIG_*, HAVE_* and ARCH_*.Aurelien Jacobs2009-01-131-2/+2
| | | | | | They are now always defined to either 0 or 1. Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove offset_t typedef and use int64_t directly instead.Diego Biurrun2008-10-031-1/+1
| | | | | | | The name offset_t is easily confused with the standard off_t type and *_t is POSIX reserved namespace if any POSIX header is included. Originally committed as revision 15533 to svn://svn.ffmpeg.org/ffmpeg/trunk
* update swf video frame number when muxing done, fix #439Baptiste Coudurier2008-07-191-0/+3
| | | | Originally committed as revision 14293 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.Stefano Sabatini2008-06-031-2/+2
| | | | | | | 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
* use internal video frame numberBaptiste Coudurier2008-05-271-1/+1
| | | | Originally committed as revision 13479 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmeticsBaptiste Coudurier2008-05-271-1/+1
| | | | Originally committed as revision 13478 to svn://svn.ffmpeg.org/ffmpeg/trunk
* simplify, use pointer to codec context in struct instead of only idBaptiste Coudurier2008-05-271-31/+23
| | | | Originally committed as revision 13476 to svn://svn.ffmpeg.org/ffmpeg/trunk
* use AVFifoBufferBaptiste Coudurier2008-05-271-7/+8
| | | | Originally committed as revision 13462 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmeticsBaptiste Coudurier2008-05-271-9/+3
| | | | Originally committed as revision 13461 to svn://svn.ffmpeg.org/ffmpeg/trunk
* merge init and declarationBaptiste Coudurier2008-05-271-3/+1
| | | | Originally committed as revision 13460 to svn://svn.ffmpeg.org/ffmpeg/trunk
* simplify and use version insteadBaptiste Coudurier2008-05-271-9/+10
| | | | Originally committed as revision 13459 to svn://svn.ffmpeg.org/ffmpeg/trunk
* simplifyBaptiste Coudurier2008-05-271-4/+1
| | | | Originally committed as revision 13458 to svn://svn.ffmpeg.org/ffmpeg/trunk
* simplifyBaptiste Coudurier2008-05-271-5/+1
| | | | Originally committed as revision 13457 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics, remove useless cases and bracesBaptiste Coudurier2008-05-271-16/+8
| | | | Originally committed as revision 13456 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics, remove useless dotBaptiste Coudurier2008-05-261-1/+1
| | | | Originally committed as revision 13421 to svn://svn.ffmpeg.org/ffmpeg/trunk
* remove useless/obsolete commentsBaptiste Coudurier2008-05-201-2/+0
| | | | Originally committed as revision 13205 to svn://svn.ffmpeg.org/ffmpeg/trunk
* split swf de/muxerBaptiste Coudurier2008-05-201-0/+561
Originally committed as revision 13203 to svn://svn.ffmpeg.org/ffmpeg/trunk