summaryrefslogtreecommitdiff
path: root/libavformat/flvenc.c
Commit message (Collapse)AuthorAge
* flvenc: Ignore metadata that has special values and is stored already based onMichael Niedermayer2011-10-06
| | | | | | more correct values. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* flvenc: Correctly encode data stream into in-band metadata frames.Joseph Wecker2011-09-07
|
* flv: Ammon's changes migrated from 0.6.0 - I believe for the android ↵Joseph Wecker2011-09-07
| | | | broadcaster.
* flvenc: use avcodec_get_name to report unsupported codecs.Nicolas George2011-08-22
|
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-17
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Revert "avconv: use stream copy by default when possible." avconv: print stream copy information. avconv: use stream copy by default when possible. matroskaenc: vertical alignment. matroskaenc: implement query_codec() lavf: add avformat_query_codec(). lavc: add avcodec_get_type() for mapping codec_id -> type. flvenc: use int64_t to store offsets avconv: don't segfault on 0 input files. Do not write ID3v1 tags by default mpegts: log into an AVFormatContext rather than MpegTSContext. Conflicts: doc/APIchanges libavcodec/version.h libavformat/avformat.h libavformat/mp3enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flvenc: use int64_t to store offsetsLuca Barbato2011-08-16
| | | | | | | | | | | | | | | | Metadata currently is written only at the start of the file in normal cases, when transcoding from a rtmp source metadata could be written later and the offset recorded can exceed 32bit. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | 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-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>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: crypto: Use av_freep instead of av_free lavf: don't try to free private options if priv_data is NULL. swscale: fix types of assembly arguments. swscale: move two macros that are only used once into caller. swscale: remove unused function. options: Add missing braces around struct initializer. mov: Remove leftover crufty debug statement with references to a local file. dvbsubdec: Fix compilation of debug code. Remove all uses of now deprecated metadata functions. Move metadata API from lavf to lavu. Conflicts: doc/APIchanges libavformat/aiffdec.c libavformat/asfdec.c libavformat/avformat.h libavformat/avidec.c libavformat/cafdec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/mp3enc.c libavformat/wtv.c libavutil/avutil.h libavutil/internal.h libswscale/swscale.c libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove all uses of now deprecated metadata functions.Anton Khirnov2011-06-08
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-07
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: build: remove empty $(OBJS) target build: make rule for linking ff* apply only to these targets build: rearrange some lines in a more logical way s302m: fix resampling for 16 and 24bits. ARM: remove MUL64 and MAC64 inline asm build: clean up .PHONY lists build: move all (un)install* target aliases to toplevel Makefile flvenc: propagate error properly build: remove stale dependency build: do not add CFLAGS-yes to CFLAGS utils.c: fix crash with threading enabled. configure: simplify source_path setup configure: remove --source-path option lavf: deprecate AVFormatParameters.time_base. img2: add framerate private option. img2: add video_size private option. img2: add pixel_format private option. tty: add framerate private option. Conflicts: Makefile configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flvenc: propagate error properlyLuca Barbato2011-06-06
| | | | | | | | | | avio_flush can fail, in particular when used with the rtmp/librtmp protocol.
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | In mov and flv muxer, check aac bitstream validity.Baptiste Coudurier2011-04-18
|/
* avio: rename put_flush_packet -> avio_flushAnton Khirnov2011-03-16
| | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* lavf: replace avio_seek(SEEK_CUR) with avio_skip where it makes senseAnton 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_ prefix for url_fseekAnton Khirnov2011-03-01
| | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* lavf: replace remaining uses of put_tag with avio_writeAnton Khirnov2011-02-25
| | | | 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.
* Replace deprecated CODEC_TYPE_AUDIO and CODEC_TYPE_VIDEO with theStefano Sabatini2010-09-25
| | | | | | corresponding AVMEDIA_TYPE_* symbols. Originally committed as revision 25201 to svn://svn.ffmpeg.org/ffmpeg/trunk
* FLV MetadataTomás Touceda2010-09-10
| | | | | | Patch by Tomás Touceda, chiiph gentoo org Originally committed as revision 25101 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add AVC EOS tag to H264-encoded FLV files.Thierry Foucu2010-08-18
| | | | | | Patch by Thierry Foucu, tfoucu gmail Originally committed as revision 24820 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move AVCodecTag from riff.h into internal.h.Francesco Lavra2010-05-22
| | | | | | Patch by Francesco Lavra, francescolavra interfree it Originally committed as revision 23250 to svn://svn.ffmpeg.org/ffmpeg/trunk
* 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
* Guess the duration before converting video and write guessed durationJustin Johnson2010-02-02
| | | | | | | | into flv header. Patch by Justin Johnson, justin D johnson3 A gmail Originally committed as revision 21615 to svn://svn.ffmpeg.org/ffmpeg/trunk
* FLV 8-bit PCM is unsigned, not signedDaniel Verkamp2009-12-14
| | | | | | Fixes issue #1569 Originally committed as revision 20853 to svn://svn.ffmpeg.org/ffmpeg/trunk
* FLV muxer support for Flash screen codec v2Daniel Verkamp2009-11-20
| | | | Originally committed as revision 20564 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Log a clearer warning message when muxing FLV with Speex containing more thanJustin Ruggles2009-10-16
| | | | | | 8 frames per packet. Originally committed as revision 20247 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add Speex support to the FLV muxer.Justin Ruggles2009-10-16
| | | | Originally committed as revision 20245 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Flv should be AVFMT_VARIABLE_FPS.Michael Niedermayer2009-09-16
| | | | Originally committed as revision 19873 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix onMetaData property count in flv files (issue 1206).Yoshihisa Uchida2009-06-20
| | | | | | Patch by Yoshihisa Uchida, yoshihisa D uchida A gmail Originally committed as revision 19236 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Splits the totalbitrate in a videodatarate and audiodatarate part.Stefan de Konink2009-02-02
| | | | | | Patch by Stefan de Konink stefan konink de Originally committed as revision 16944 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
* use ff_avc_parse_nal_units_buf because output size might differ from input sizeBaptiste Coudurier2009-01-16
| | | | Originally committed as revision 16626 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Reindent after last commitLuca Abeni2009-01-15
| | | | Originally committed as revision 16617 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Do not reallocate AVPacket's data when muxing a packetLuca Abeni2009-01-15
| | | | Originally committed as revision 16616 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Change semantic of CONFIG_*, HAVE_* and ARCH_*.Aurelien Jacobs2009-01-13
| | | | | | They are now always defined to either 0 or 1. Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
* remove comment, this is not relevant anymoreBaptiste Coudurier2009-01-11
| | | | Originally committed as revision 16528 to svn://svn.ffmpeg.org/ffmpeg/trunk
* reindentBaptiste Coudurier2009-01-11
| | | | Originally committed as revision 16527 to svn://svn.ffmpeg.org/ffmpeg/trunk
* check for negative dts value even if bitstream is already formated,Baptiste Coudurier2009-01-11
| | | | | | this fixes dts when stream copying. Originally committed as revision 16526 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Nellymoser 8KHZ flv muxing fix, patch by Alexander Wichers development at ↵Alexander Wichers2008-10-18
| | | | | | wichersdot nu Originally committed as revision 15633 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove offset_t typedef and use int64_t directly instead.Diego Biurrun2008-10-03
| | | | | | | 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
* Bump Major version, this commit is almost just renaming bits_per_sample toLuca Abeni2008-09-08
| | | | | | | | | | | bits_per_coded_sample but that cannot be done seperately. Patch by Luca Abeni Also reset the minor version and fix the forgotton change to libfaad. Note: The API/ABI should not be considered stable yet, there still may be a change done here or there if some developer has some cleanup ideas and patches! Originally committed as revision 15262 to svn://svn.ffmpeg.org/ffmpeg/trunk
* timestamps in flv are 32bits _signed_ according to flash player, specs are wrongBaptiste Coudurier2008-08-30
| | | | Originally committed as revision 15045 to svn://svn.ffmpeg.org/ffmpeg/trunk