summaryrefslogtreecommitdiff
path: root/libavformat/gxfenc.c
Commit message (Collapse)AuthorAge
...
* | gxfenc: support timecode optionMatthieu Bouron2011-12-07
| | | | | | | | Reviewed-by: Baptiste Coudurier
* | 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.
* | gxfenc: Replace av_realloc by av_realloc_f when relevant.Nicolas George2011-09-28
| | | | | | | | | | Signed-off-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-18
|\| | | | | | | | | | | | | | | | | | | | | | | * qatar/master: vf_libopencv: replace opencv/cxtypes.h #include by opencv/cxcore.h dsputil: remove disabled code tta: remove disabled code gxfenc: place variable declarations before statements x86: Use LOCAL_ALIGNED in mpegvideo_mmx_template random_seed: use proper #includes Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * gxfenc: place variable declarations before statementsDiego Biurrun2011-07-17
| | | | | | | | libavformat/gxfenc.c:409: warning: ISO C90 forbids mixed declarations and code
* | 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 commit 'b5849f77095439e994b11c25e6063d443b36c228'Michael Niedermayer2011-07-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b5849f77095439e994b11c25e6063d443b36c228': (21 commits) ac3enc: merge AC3MDCTContext with AC3EncodeContext. ac3enc: prefer passing AC3EncodeContext rather than AVCodecContext ac3enc: fix memleak mpeg1video: add CODEC_CAP_SLICE_THREADS. lavf: fix segfault in av_open_input_stream() mpegtsenc: set Random Access indicator on keyframe start packets lavf: Cleanup try_decode_frame() logic. Replace some gotos that lead to single return statements by direct return. build: move tests/seek_test.c to libavformat and reuse generic build rules mxfenc: include needed header for ff_iso8601_to_unix_time() prototype Add a check for strptime(). lavf: factor out conversion of ISO8601 string to unix time wav: parse 'bext' metadata wav: keep parsing until EOF if the input is seekable and we know the size of the data tag wav: Refactor the tag checking into a switch statement wav: make sure neither data_size nor sample_count is negative. wav: refactor the 'fmt ' tag search and parsing. wav: add an option for writing BEXT chunk ffmpeg: get rid of a pointless limit on number of streams. ffmpeg: remove an unused define. ... Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: factor out conversion of ISO8601 string to unix timeAnton Khirnov2011-07-13
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: doc: Improve references to external URLs. h264: move decode_mb_skip() from h264.h to h.264_mvpred.h ffplay: skip return value of avcodec_decode_video2 / avcodec_decode_subtitle2 dnxhdenc: Replace a forward declaration by the proper #include. h264: move h264_mvpred.h include. pix_fmt: Fix number of bits per component in yuv444p9be lavf: deprecate AVFormatContext.timestamp ffmpeg: merge input_files_ts_scale into InputStream. ffmpeg: don't abuse a global for passing sample format from input to output ffmpeg: don't abuse a global for passing channel layout from input to output ffmpeg: factor common code from new_a/v/s/d_stream to new_output_stream() matroskaenc: make SSA default subtitle codec. oggdec: prevent heap corruption. Conflicts: doc/developer.texi doc/faq.texi doc/general.texi ffmpeg.c ffplay.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: deprecate AVFormatContext.timestampAnton Khirnov2011-07-12
| | | | | | | | It's replaced by 'creation_time' metadata tag.
* | 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 mathematics.h in avutil.hMans Rullgard2011-07-03
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Do not include intfloat_readwrite.h in avutil.hMans Rullgard2011-07-03
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*.Stefano Sabatini2011-05-02
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*Stefano Sabatini2011-05-02
| |
* | 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: introduce an AVIOContext.seekable fieldAnton Khirnov2011-04-03
| | | | | | | | Use it instead of url_is_streamed and AVIOContext.is_streamed.
| * 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: avio_ prefix for url_fsizeAnton Khirnov2011-03-07
| | | | 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.
* In gxf muxer, round up number of lines mod 16 in mpeg umf data, based patch ↵Baptiste Coudurier2010-10-07
| | | | | | by Reuben Martin, reuben dot m at gmail dot com Originally committed as revision 25401 to svn://svn.ffmpeg.org/ffmpeg/trunk
* In gxf muxer, fix number of flt entries based on patch by Reuben Martin, ↵Baptiste Coudurier2010-10-07
| | | | | | reuben dot m at gmail dot com Originally committed as revision 25399 to svn://svn.ffmpeg.org/ffmpeg/trunk
* In gxf muxer, write umf media for mpeg1video, patch by Reuben Martin, reuben ↵Reuben Martin2010-10-07
| | | | | | dot m at gmail dot com Originally committed as revision 25396 to svn://svn.ffmpeg.org/ffmpeg/trunk
* In gxf muxer, fix flt entry offset, patch by Reuben Martin, reuben dot m at ↵Reuben Martin2010-10-07
| | | | | | gmail dot com Originally committed as revision 25395 to svn://svn.ffmpeg.org/ffmpeg/trunk
* gxf muxer only accepts pal or ntsc resolutions currently, so fail if ↵Baptiste Coudurier2010-09-01
| | | | | | resolution is something else Originally committed as revision 25014 to svn://svn.ffmpeg.org/ffmpeg/trunk
* gxfenc: Fix ES name in the UMF media description, by using strlen instead of ↵Thierry Foucu2010-07-21
| | | | | | | | sizeof Patch by Thierry Foucu, tfoucu at gmail Originally committed as revision 24379 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
* Make AVCodecTag.id enum CodecID and use CODEC_ID_NONE instead of 0.Carl Eugen Hoyos2009-10-16
| | | | Originally committed as revision 20250 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
* remove useless includeBaptiste Coudurier2009-05-23
| | | | Originally committed as revision 18906 to svn://svn.ffmpeg.org/ffmpeg/trunk
* reindentBaptiste Coudurier2009-03-09
| | | | Originally committed as revision 17898 to svn://svn.ffmpeg.org/ffmpeg/trunk
* change path pattern to be similar to existing files, and remove useless bufferBaptiste Coudurier2009-03-09
| | | | Originally committed as revision 17896 to svn://svn.ffmpeg.org/ffmpeg/trunk
* merge struct declaration and definitionBaptiste Coudurier2009-03-09
| | | | Originally committed as revision 17895 to svn://svn.ffmpeg.org/ffmpeg/trunk
* write map packet every 100 packets according to specsBaptiste Coudurier2009-03-09
| | | | Originally committed as revision 17894 to svn://svn.ffmpeg.org/ffmpeg/trunk
* write flt packet, might need some tweaking but it worksBaptiste Coudurier2009-03-09
| | | | Originally committed as revision 17893 to svn://svn.ffmpeg.org/ffmpeg/trunk
* correctly interleave audio and video according to specsBaptiste Coudurier2009-03-09
| | | | Originally committed as revision 17892 to svn://svn.ffmpeg.org/ffmpeg/trunk
* write timecode track in gxfBaptiste Coudurier2009-03-09
| | | | Originally committed as revision 17890 to svn://svn.ffmpeg.org/ffmpeg/trunk
* compute media info in write_headerBaptiste Coudurier2009-03-08
| | | | Originally committed as revision 17889 to svn://svn.ffmpeg.org/ffmpeg/trunk
* factorize write packetBaptiste Coudurier2009-03-08
| | | | Originally committed as revision 17888 to svn://svn.ffmpeg.org/ffmpeg/trunk
* remove unneeded and empty user dataBaptiste Coudurier2009-03-08
| | | | Originally committed as revision 17886 to svn://svn.ffmpeg.org/ffmpeg/trunk
* uniformize variable names and remove duplicating fields in private structsBaptiste Coudurier2009-03-08
| | | | Originally committed as revision 17884 to svn://svn.ffmpeg.org/ffmpeg/trunk
* remove useless fieldsBaptiste Coudurier2009-03-08
| | | | Originally committed as revision 17883 to svn://svn.ffmpeg.org/ffmpeg/trunk