summaryrefslogtreecommitdiff
path: root/libavformat/nutenc.c
Commit message (Collapse)AuthorAge
...
* | 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
| |
* | Simplify condition.Reimar Döffinger2011-05-07
| |
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-05-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (23 commits) doc: Check standalone compilation before submitting new components. Fix standalone compilation of pipe protocol. Fix standalone compilation of ac3_fixed encoder. Fix standalone compilation of binkaudio_dct / binkaudio_rdft decoders. Fix standalone compilation of IMC decoder. Fix standalone compilation of WTV demuxer. Fix standalone compilation of MXPEG decoder. flashsv: K&R cosmetics matroskaenc: fix memory leak vc1: make overlap filter for I-frames bit-exact. vc1dec: use s->start/end_mb_y instead of passing them as function args. Revert "VC1: merge idct8x8, coeff adjustments and put_pixels." Replace strncpy() with av_strlcpy(). indeo3: Eliminate use of long. get_bits: make cache unsigned to eliminate undefined signed overflow. asfdec: fix assert failure on invalid files avfilter: check malloc return values. Not pulled as reason for reindent is not pulled: mpegvideo: reindent. nutenc: check malloc return values. Not pulled due to much simpler solution in ffmpeg *: don't av_malloc(0). ... Conflicts: doc/developer.texi libavcodec/Makefile libavcodec/get_bits.h libavcodec/mpegvideo.c libavformat/Makefile libavutil/log.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nutenc: check malloc return values.Ronald S. Bultje2011-05-03
| |
| * nutenc: don't av_malloc(0).Ronald S. Bultje2011-05-03
| |
* | Revert "Eliminate pointless '#if 1' statements without matching '#else'."Michael Niedermayer2011-04-27
| | | | | | | | | | | | | | | | | | | | | | | | no comment This reverts commit e6ff064845d02c43526c8a56dab121c219f16659. Conflicts: libavcodec/dsputil.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (23 commits) ac3enc: correct the flipped sign in the ac3_fixed encoder Eliminate pointless '#if 1' statements without matching '#else'. Add AVX FFT implementation. Increase alignment of av_malloc() as needed by AVX ASM. Update x86inc.asm from x264 to allow AVX emulation using SSE and MMX. mjpeg: Detect overreads in mjpeg_decode_scan() and error out. documentation: extend documentation for ffmpeg -aspect option APIChanges: update commit hashes for recent additions. lavc: deprecate FF_*_TYPE macros in favor of AV_PICTURE_TYPE_* enums aac: add headers needed for log2f() lavc: remove FF_API_MB_Q cruft lavc: remove FF_API_RATE_EMU cruft lavc: remove FF_API_HURRY_UP cruft pad: make the filter parametric vsrc_movie: add key_frame and pict_type. vsrc_movie: fix leak in request_frame() lavfi: add key_frame and pict_type to AVFilterBufferRefVideo. vsrc_buffer: add sample_aspect_ratio fields to arguments. lavfi: add fieldorder filter scale: make the filter parametric ... Conflicts: Changelog doc/filters.texi ffmpeg.c libavcodec/ac3dec.h libavcodec/dsputil.c libavfilter/avfilter.h libavfilter/vf_scale.c libavfilter/vf_yadif.c libavfilter/vsrc_buffer.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Eliminate pointless '#if 1' statements without matching '#else'.Diego Biurrun2011-04-26
| |
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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: avio_ prefix for url_close_dyn_bufAnton Khirnov2011-04-03
| |
| * avio: avio_ prefix for url_open_dyn_bufAnton Khirnov2011-04-03
| |
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-31
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * newdev/master: rtsp: Use GET_PARAMETER for keep-alive for generic RTSP servers mlp_parse.c: set AVCodecContext channel_layout APIChanges: mark the place where 0.6 was branched. avio: make get_checksum() internal. avio: move ff_crc04C11DB7_update() from avio.h -> avio_internal.h avio: make init_checksum() internal. NOT MERGED Add MxPEG decoder NOT MERGED Add support for picture_ptr field in MJpegDecodeContext NOT MERGED Move MJPEG's input buffer preprocessing in separate public function NOT MERGED Support reference picture defined by bitmask in MJPEG's SOS decoder sndio bug fix Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: make get_checksum() internal.Anton Khirnov2011-03-30
| |
| * avio: make init_checksum() internal.Anton Khirnov2011-03-30
| |
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
|/ | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* nutenc: fix a memleakAnton Khirnov2011-03-17
| | | | | | This fixes a minor memory leak introduced in 073f8b1. 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>
* nutenc: mux chapters.Anton Khirnov2011-03-17
| | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* 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.
* Export metadata in the generic format. Deprecate old conversion API.Anton Khirnov2010-10-15
| | | | | | patch by Anton Khirnov anton _at_ khirnov _dot_ net Originally committed as revision 25493 to svn://svn.ffmpeg.org/ffmpeg/trunk
* nutenc: fix unstable floating-point calculationsMåns Rullgård2010-09-10
| | | | Originally committed as revision 25095 to svn://svn.ffmpeg.org/ffmpeg/trunk
* move ff_get_v_length and ff_put_v from nutenc.c to internal.h/aviobuf.cMichael Chinen2010-07-09
| | | | | | patch by Micheal Chinen < mchinen gmail > Originally committed as revision 24140 to svn://svn.ffmpeg.org/ffmpeg/trunk
* rename get_length to ff_get_v_length and put_v to ff_put_vMichael Chinen2010-07-09
| | | | | | patch by Michael Chinen < mchinen gmail > Originally committed as revision 24139 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix grammar errors in documentationMåns Rullgård2010-06-30
| | | | Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make write_streamheader() log a message if there is no codec tagStefano Sabatini2010-06-02
| | | | | | defined. Originally committed as revision 23434 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make write_streamheader() return a meaningful error code if no codecStefano Sabatini2010-06-02
| | | | | | tag is defined, rather than return -1. Originally committed as revision 23433 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make write_header() and write_headers() return an error code in case ofStefano Sabatini2010-06-02
| | | | | | error. Originally committed as revision 23432 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make write_streamheader() and write_headers() accept anStefano Sabatini2010-06-02
| | | | | | | AVFormatContext * in input rather than a NUTContext *, which allows to log messages with av_log(). Originally committed as revision 23431 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Define ff_nut_video_tags and make Nut muxer and demuxer set it inStefano Sabatini2010-05-23
| | | | | | codec_tag. Originally committed as revision 23259 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
* Fix NUT (de)muxer warnings:Vitor Sessak2010-03-28
| | | | | | | | | | | | | | | | | CC libavformat/nutdec.o libavformat/nutdec.c: In function ‘read_seek’: libavformat/nutdec.c:862: warning: passing argument 3 of ‘av_tree_find’ from incompatible pointer type ./libavutil/tree.h:44: note: expected ‘int (*)(void *, const void *)’ but argument is of type ‘int (*)(struct Syncpoint *, struct Syncpoint *)’ libavformat/nutdec.c:871: warning: passing argument 3 of ‘av_tree_find’ from incompatible pointer type ./libavutil/tree.h:44: note: expected ‘int (*)(void *, const void *)’ but argument is of type ‘int (*)(struct Syncpoint *, struct Syncpoint *)’ libavformat/nutdec.c:879: warning: passing argument 3 of ‘av_tree_find’ from incompatible pointer type ./libavutil/tree.h:44: note: expected ‘int (*)(void *, const void *)’ but argument is of type ‘int (*)(struct Syncpoint *, struct Syncpoint *)’ CC libavformat/nutenc.o libavformat/nutenc.c: In function ‘write_packet’: libavformat/nutenc.c:680: warning: passing argument 3 of ‘av_tree_find’ from incompatible pointer type ./libavutil/tree.h:44: note: expected ‘int (*)(void *, const void *)’ but argument is of type ‘int (*)(struct Syncpoint *, struct Syncpoint *)’ Originally committed as revision 22707 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Plug memory leak in NUT muxer and demuxerVitor Sessak2010-03-03
| | | | Originally committed as revision 22174 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Revert r22119 and partially revert 22120.Vitor Sessak2010-03-01
| | | | Originally committed as revision 22135 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Plug some memory leaks in NUT muxer and demuxerVitor Sessak2010-02-28
| | | | Originally committed as revision 22120 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Introduce metadata conversion table for NUT muxer and demuxer.Anton Khirnov2010-02-24
| | | | | | | Patch by Anton Khirnov (wyskas, do no evil mail) Thread "[PATCH] nut metadata conversion table" Originally committed as revision 22015 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add ff_ prefixes to exported symbols in libavformat/riff.h.Daniel Verkamp2009-06-22
| | | | | | patch by Daniel Verkamp, aniel drv nu Originally committed as revision 19254 to svn://svn.ffmpeg.org/ffmpeg/trunk
* use new metadata API in nut muxerAurelien Jacobs2009-02-27
| | | | | | | This is only a straight conversion of current code, so for now, it won't mux generic metadata. It will only mux Title, Author and Copyright. Originally committed as revision 17653 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add AVFMT_VARIABLE_FPS to specify which muxers do not need duplicated frames.Michael Niedermayer2009-02-24
| | | | Originally committed as revision 17554 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: 'const static' --> 'static const' to avoid warnings of the typeDiego Biurrun2009-02-17
| | | | | | "'static' is not at beginning of declaration" with -Wextra. Originally committed as revision 17391 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
* 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
* remove _t for POSIX compatibility.Michael Niedermayer2008-12-11
| | | | Originally committed as revision 16057 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Change codec_tag type from const struct AVCodecTag ** to const struct ↵Reimar Döffinger2008-08-24
| | | | | | AVCodecTag * const * Originally committed as revision 14947 to svn://svn.ffmpeg.org/ffmpeg/trunk
* convert every muxer/demuxer to write/read sample_aspect_ratio from/toAurelien Jacobs2008-08-23
| | | | | | the corresponding AVStream instead of AVCodecContext Originally committed as revision 14933 to svn://svn.ffmpeg.org/ffmpeg/trunk
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-15 17:52:47 +0000