aboutsummaryrefslogtreecommitdiff
path: root/libavformat/mxfenc.c
AgeCommit message (Collapse)Author
2013-09-29avformat/mxfenc: instance number is just 24 bitsMichael Niedermayer
Fixes assertion failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-12Use rc_max_rate if no video bit_rate was specified when muxing mxf_d10.Carl Eugen Hoyos
Fixes ticket #2945. Reviewed-by: Matthieu Bouron
2013-09-12Store the video bit_rate in the context when muxing mxf.Carl Eugen Hoyos
This will allow using rc_max_rate if no bit_rate is specified (on remuxing). Reviewed-by: Matthieu Bouron
2013-08-05Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: mxfenc: switch to av_reallocp_array() and check allocation errors Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-04mxfenc: switch to av_reallocp_array() and check allocation errorsAlexandra Khirnova
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-07-15mxfenc: use ffio_fill()Paul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-16Merge commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110'Michael Niedermayer
* commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110': vf_aspect: use the name 's' for the pointer to the private context Remove commented-out debug #define cruft Conflicts: libavcodec/4xm.c libavcodec/dvdsubdec.c libavcodec/ituh263dec.c libavcodec/mpeg12.c libavfilter/avfilter.c libavfilter/vf_aspect.c libavfilter/vf_fieldorder.c libavformat/rtmpproto.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-16Remove commented-out debug #define cruftDiego Biurrun
2013-04-30avformat: Drop unnecessary ff_ name prefixes from static functionsDiego Biurrun
2013-04-22Merge commit 'a0d5ca4f0a8e2c34d784d503a12af6303424ac6a'Michael Niedermayer
* commit 'a0d5ca4f0a8e2c34d784d503a12af6303424ac6a': mxfenc: Use correct printf format specifier for int64_t h264: Drop unused variable Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-22mxfenc: Use correct printf format specifier for int64_tDiego Biurrun
libavformat/mxfenc.c:1861:9: warning: format '%lld' expects argument of type 'long long int', but argument 5 has type 'int64_t' [-Wformat]
2013-01-06mxfenc: avoid depending on private codec structures and functionsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-04Fix "knwon" typo and add a check in tools/patcheckPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-10-25mxfenc: Write MultipleDescriptor ref in PrefaceTomas Härdin
Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-24mxfenc: Fix possible integer overflowsTomas Härdin
None of these are likely unless the user is writing a file with two billion streams or a duration of around two months. This fixes CIDs 700568, 700569, 700570, 700571, 700572 and 700573. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-21libavformat/mxfenc: add {} to complex ifsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-16mxfenc: explicitly truncate continuity count.Michael Niedermayer
The field is intended to overflow and have only its low 16bits stored. This commit avoids the implicit truncation and clarifies that its intended and not a bug S326m section 7.6 ("Continuity count"): > The continuity count word consists of 2 bytes allow- > ing a number to be created by a modulo 65536 > counter (bits C15 to C0 in figure 7). The continuity > count shall increment by 1 for each newly transmit- > ted content package with the same SDTI source and > destination addresses. The continuity count may > be used to detect whether the content package > sequence has been broken by an operation such as > a routing switch. Approved-by: Tjoppen Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-08mxfenc: fix av_log data type for dts paramaterMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-01Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: avcodec: Convert some commented-out printf/av_log instances to av_dlog avcodec: Drop silly and/or broken printf debug output avcodec: Drop some silly commented-out av_log() invocations avformat: Convert some commented-out printf/av_log instances to av_dlog avformat: Remove non-compiling and/or silly commented-out printf/av_log statements Remove some silly disabled code. ac3dec: ensure get_buffer() gets a buffer for the correct number of channels Conflicts: libavcodec/dnxhddec.c libavcodec/ffv1.c libavcodec/h264.c libavcodec/h264_parser.c libavcodec/mjpegdec.c libavcodec/motion_est_template.c libavcodec/mpegaudiodec.c libavcodec/mpegvideo_enc.c libavcodec/put_bits.h libavcodec/ratecontrol.c libavcodec/wmaenc.c libavdevice/timefilter.c libavformat/asfdec.c libavformat/avidec.c libavformat/avienc.c libavformat/flvenc.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-01avformat: Convert some commented-out printf/av_log instances to av_dlogDiego Biurrun
2012-09-21mxf: export ff_mxf_get_samples_per_frame to lavfMatthieu Bouron
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-20mxfenc: support 23.976 and 24 frame ratesMatthieu Bouron
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-20mxfenc: factorize samples per frame codeMatthieu Bouron
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-16Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b'Michael Niedermayer
* commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b': avformat: fix typo in avformat_close_input mp3enc: write Xing TOC mp3enc: support MPEG-2 and MPEG-2.5 in Xing header. mp3enc: downgrade some errors in writing Xing frame to warnings lavf: flush the output AVIOContext in av_write_trailer(). lavf: cosmetics, reformat av_write_trailer(). avio: flush the internal buffer in avio_close() Enhance doc on asyncts audiofilter cmdutils: avoid setting data pointers to invalid values in alloc_buffer() libavcodec: remove av_destruct_packet_nofree() Conflicts: libavcodec/avpacket.c libavformat/mp3enc.c libavformat/nutenc.c libavformat/utils.c libavformat/version.h tests/ref/lavf/voc tests/ref/lavf/voc_s16 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-15lavf: flush the output AVIOContext in av_write_trailer().Anton Khirnov
This is consistent with stdio and is what we want to do in all cases. Fixes a bug in the voc muxer which didn't flush in write_trailer() previously. This is the cause of the change in the test results.
2012-09-01lavf: add missing new line to some error messagesPiotr Bandurski
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-08lavf/mxfenc: better error handling with invalid frame rate.Clément Bœsch
2012-08-08lavf/mxfenc: simplify frame rate checks.Clément Bœsch
2012-08-07Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer
* commit '36ef5369ee9b336febc2c270f8718cec4476cb85': Replace all CODEC_ID_* with AV_CODEC_ID_* lavc: add AV prefix to codec ids. Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/examples/muxing.c ffmpeg.c ffprobe.c ffserver.c libavcodec/8svx.c libavcodec/avcodec.h libavcodec/dnxhd_parser.c libavcodec/dvdsubdec.c libavcodec/error_resilience.c libavcodec/h263dec.c libavcodec/libvorbisenc.c libavcodec/mjpeg_parser.c libavcodec/mjpegenc.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/pcm.c libavcodec/r210dec.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/version.h libavdevice/alsa-audio-dec.c libavdevice/bktr.c libavdevice/v4l2.c libavformat/asfdec.c libavformat/asfenc.c libavformat/avformat.h libavformat/avidec.c libavformat/caf.c libavformat/electronicarts.c libavformat/flacdec.c libavformat/flvdec.c libavformat/flvenc.c libavformat/framecrcenc.c libavformat/img2.c libavformat/img2dec.c libavformat/img2enc.c libavformat/ipmovie.c libavformat/isom.c libavformat/matroska.c libavformat/matroskadec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/movenc.c libavformat/mp3dec.c libavformat/mpeg.c libavformat/mpegts.c libavformat/mxf.c libavformat/mxfdec.c libavformat/mxfenc.c libavformat/nsvdec.c libavformat/nut.c libavformat/oggenc.c libavformat/pmpdec.c libavformat/rawdec.c libavformat/rawenc.c libavformat/riff.c libavformat/sdp.c libavformat/utils.c libavformat/vocenc.c libavformat/wtv.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-07Replace all CODEC_ID_* with AV_CODEC_ID_*Anton Khirnov
2012-08-06Replace various inlined inverse AVRational with av_inv_q().Clément Bœsch
2012-07-31Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: mpc8: return more meaningful error codes. mpc: return more meaningful error codes. wv,mpc8: don't return apetag data in packets. rtmp: do not warn about receiving metadata packets x86: h264dsp: Adjust YASM #ifdefs x86: yadif: Mark mmxext optimizations as such h264: convert loop filter strength dsp function to yasm. Improve descriptiveness of a number of codec and container long names Conflicts: libavcodec/flvdec.c libavcodec/libopenjpegdec.c libavformat/apetag.c libavformat/mp3dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-30Improve descriptiveness of a number of codec and container long namesDiego Biurrun
2012-07-12mxfenc: switch to av_assertMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-11lavf/mxfenc: fix dnxhd codec uls and aspect ratioMatthieu Bouron
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-05mxfenc: support dnxhd codecMatthieu Bouron
2012-07-05mxfenc: support smpte dv codecMatthieu Bouron
After some internal talks it seems the code is similar to what is in FFmbc by Baptiste Coudurier; Baptiste accepted to relicense the similiar chunks from GPL to LGPL.
2012-06-06mxfenc: write optional field dominance flag in picture descriptionMatthieu Bouron
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-04timecode: move timecode muxer options to metadata.Clément Bœsch
Some demuxers set a timecode in the format or streams metadata. The muxers now make use of this metadata instead of a duplicated private option. This makes possible transparent copy of the timecode when transmuxing and transcoding. -timecode option for MPEG1/2 codec is also renamed to -gop_timecode. The global ffmpeg -timecode option will set it anyway so no option change visible for the user.
2012-05-31mxfenc: support 50 and 60 frame ratesMatthieu Bouron
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-03mxfenc: Don't allow muxing audio-only since it's not supportedTomas Härdin
This fixes muxing audio-only output resulting in SIGFPE due to lack of EditRate. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-02mxfenc: use new public timecode API.Clément Bœsch
2012-01-28Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (71 commits) movenc: Allow writing to a non-seekable output if using empty moov movenc: Support adding isml (smooth streaming live) metadata libavcodec: Don't crash in avcodec_encode_audio if time_base isn't set sunrast: Document the different Sun Raster file format types. sunrast: Add a check for experimental type. libspeexenc: use AVSampleFormat instead of deprecated/removed SampleFormat lavf: remove disabled FF_API_SET_PTS_INFO cruft lavf: remove disabled FF_API_OLD_INTERRUPT_CB cruft lavf: remove disabled FF_API_REORDER_PRIVATE cruft lavf: remove disabled FF_API_SEEK_PUBLIC cruft lavf: remove disabled FF_API_STREAM_COPY cruft lavf: remove disabled FF_API_PRELOAD cruft lavf: remove disabled FF_API_NEW_STREAM cruft lavf: remove disabled FF_API_RTSP_URL_OPTIONS cruft lavf: remove disabled FF_API_MUXRATE cruft lavf: remove disabled FF_API_FILESIZE cruft lavf: remove disabled FF_API_TIMESTAMP cruft lavf: remove disabled FF_API_LOOP_OUTPUT cruft lavf: remove disabled FF_API_LOOP_INPUT cruft lavf: remove disabled FF_API_AVSTREAM_QUALITY cruft ... Conflicts: doc/APIchanges libavcodec/8bps.c libavcodec/avcodec.h libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/options.c libavcodec/sunrast.c libavcodec/utils.c libavcodec/version.h libavcodec/x86/h264_deblock.asm libavdevice/libdc1394.c libavdevice/v4l2.c libavformat/avformat.h libavformat/avio.c libavformat/avio.h libavformat/aviobuf.c libavformat/dv.c libavformat/mov.c libavformat/utils.c libavformat/version.h libavformat/wtv.c libavutil/Makefile libavutil/file.c libswscale/x86/input.asm libswscale/x86/swscale_mmx.c libswscale/x86/swscale_template.c tests/ref/lavf/ffm Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-27lavf: remove disabled FF_API_TIMESTAMP cruftAnton Khirnov
2011-12-21mxfenc: Add support for MPEG-2 MP@HL-14 in mxf container.Daniel Kristjansson
Support Main Profile at High 1440 Level in MXF container, using essence coding label from SMPTE RDD 9, table 6. Signed-off-by: Janne Grunau <janne-libav@jannau.net>
2011-12-12timecode: rename internal ff_* symbols to avpriv_*.Clément Bœsch
Those functions are shared between libs. Also fix a typo in function names: smtpe → smpte.
2011-12-12Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: x86: cabac: replace explicit memory references with "m" operands avplay: don't request a stereo downmix wmapro: use av_float2int() lavc: avoid invalid memcpy() in avcodec_default_release_buffer() lavu: replace int/float punning functions lavfi: install libavfilter/vsrc_buffer.h Remove extraneous semicolons sdp: Restore the original mp4 format h264 extradata if converted rtpenc: Add support for mp4 format h264 rtpenc: Simplify code by introducing a separate end pointer movenc: Use the actual converted sample for RTP hinting Fix a bunch of common typos. Conflicts: doc/developer.texi doc/eval.texi doc/filters.texi doc/protocols.texi ffmpeg.c ffplay.c libavcodec/mpegvideo.h libavcodec/x86/cabac.h libavfilter/Makefile libavformat/avformat.h libavformat/cafdec.c libavformat/flvdec.c libavformat/flvenc.c libavformat/gxfenc.c libavformat/img2.c libavformat/movenc.c libavformat/mpegts.c libavformat/rtpenc_h264.c libavformat/utils.c libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-11Fix a bunch of common typos.Diego Biurrun
2011-12-01Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* 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>
2011-11-30lavf: make av_set_pts_info private.Anton Khirnov
It's supposed to be called only from (de)muxers.
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-15 11:58:50 +0000