summaryrefslogtreecommitdiffstats
path: root/libavformat/avienc.c
Commit message (Collapse)AuthorAgeFilesLines
...
| * riffenc: take an AVStream instead of an AVCodecContextAnton Khirnov2014-06-181-2/+2
| | | | | | | | | | | | It will be useful in the following commits. Also, rename the AVCodecContext pointer name from 'stream' to 'codec'.
* | Refuse to mux H.264 with fourcc H264 into avi without startcode.Carl Eugen Hoyos2014-05-231-0/+6
| | | | | | | | Fixes ticket #3638.
* | Set dwSuggestBufferSize to largest chunk size for every stream in avi.Carl Eugen Hoyos2014-05-191-1/+7
| | | | | | | | | | | | | | Fixes playback with WMP 9 for files with large (rawvideo) frames as explained in ticket #2145. Fixes ticket #2818.
* | Merge commit 'c3311d472a7528c67f76d0d061704ae70a99b32e'Michael Niedermayer2014-05-181-57/+57
|\| | | | | | | | | | | | | | | | | | | * commit 'c3311d472a7528c67f76d0d061704ae70a99b32e': avienc: sanitize variable naming in write_header() Conflicts: libavformat/avienc.c Merged-by: Michael Niedermayer <[email protected]>
| * avienc: sanitize variable naming in write_header()Anton Khirnov2014-05-181-41/+41
| | | | | | | | | | | | Do not call an AVCodecContext 'stream', that is highly confusing. Also, add a local variable for the current AVStream in the loop over all streams.
* | ff_put_wav_header: add flag to force WAVEFORMATEXDaniel Verkamp2014-04-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partially undoes commit 2c4e08d89327595f7f4be57dda4b3775e1198d5e: riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header A new flag, FF_PUT_WAV_HEADER_FORCE_WAVEFORMATEX, is added to force the use of WAVEFORMATEX rather than PCMWAVEFORMAT even for PCM codecs. This flag is used in the Matroska muxer (the cause of the original change) and in the ASF muxer, because the specifications for these formats indicate explicitly that WAVEFORMATEX should be used. Muxers for other formats will return to the original behavior of writing PCMWAVEFORMAT when writing a header for raw PCM. In particular, this causes raw PCM in WAV to generate the canonical 44-byte header expected by some tools. Signed-off-by: Michael Niedermayer <[email protected]>
* | Fix writing RGB 5:5:5 rawvideo into avi.Carl Eugen Hoyos2014-04-141-0/+6
| | | | | | | | WMP expects bits per pixel to be set to 16 for RGB 5:5:5 rawvideo.
* | Warn if rawvideo and an unreadable pix_fmt are written.Carl Eugen Hoyos2014-04-111-0/+11
| | | | | | | | | | | | Print an error if a combination of rawvideo and an unusual pix_fmt that will be impossible to decode are written to avi or mov. Fixes ticket #3545.
* | Merge commit '3407172b36a93cec410c6a287dbeec0f41257512'Michael Niedermayer2014-03-041-209/+219
|\| | | | | | | | | | | | | | | | | | | * commit '3407172b36a93cec410c6a287dbeec0f41257512': avienc: K&R formatting cosmetics Conflicts: libavformat/avienc.c Merged-by: Michael Niedermayer <[email protected]>
| * avienc: K&R formatting cosmeticsKeiji Costantini2014-03-041-194/+205
| | | | | | | | Signed-off-by: Diego Biurrun <[email protected]>
* | lavf/avienc: cosmetic indentJames Darnley2014-01-241-4/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | lavf/avienc: use metadata_header_paddingJames Darnley2014-01-241-1/+9
| | | | | | | | | | | | | | | | The muxer will write at least the number of bytes requested and possibly up to 3 bytes more. This is because the muxer writes 32-bit integers and the format requires 4-byte alignment anyway. Signed-off-by: Michael Niedermayer <[email protected]>
* | riffenc: add option to ff_put_bmp_header to ignore extradataPeter Ross2013-12-231-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | libavf/avienc: store language metadata for XSUB streamsErik Olofsson2013-11-091-0/+12
| | | | | | | | | | | | | | | | | | | | Formatted in such a way that DivX certified players can decode it. Verified on Sony Playstation 3 and Philips DVP3380. Fixes ticket 2385 Signed-off-by: Erik Olofsson <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-091-1/+0
|\| | | | | | | | | | | | | * qatar/master: avienc: drop the vfr flag. Merged-by: Michael Niedermayer <[email protected]>
| * avienc: drop the vfr flag.Anton Khirnov2013-11-081-1/+0
| | | | | | | | | | AVI does not really support vfr properly, only by padding with null packets.
* | Merge commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9'Michael Niedermayer2013-09-271-1/+4
|\| | | | | | | | | | | | | | | | | | | * commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9': lavf: Reset the entry count and allocation size variables on av_reallocp failures Conflicts: libavformat/avienc.c Merged-by: Michael Niedermayer <[email protected]>
| * lavf: Reset the entry count and allocation size variables on av_reallocp ↵Martin Storsjö2013-09-261-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | failures When av_reallocp fails, the associated variables that keep track of the number of elements in the array (and in some cases, the separate number of allocated elements) need to be reset. Not all of these might technically be needed, but it's better to reset them if in doubt, to make sure variables don't end up conflicting. Signed-off-by: Martin Storsjö <[email protected]>
* | avformat/avienc: remove unused variableMichael Niedermayer2013-09-201-1/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit '5626f994f273af80fb100d4743b963304de9e05c'Michael Niedermayer2013-09-191-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5626f994f273af80fb100d4743b963304de9e05c': avformat: Use av_reallocp() where suitable Conflicts: libavformat/avidec.c libavformat/avienc.c libavformat/aviobuf.c libavformat/oggparsevorbis.c libavformat/utils.c Merged-by: Michael Niedermayer <[email protected]>
| * avformat: Use av_reallocp() where suitableAlexandra Khirnova2013-09-181-3/+3
| | | | | | | | Signed-off-by: Diego Biurrun <[email protected]>
| * lavf: Don't explicitly flush after each written packet in muxersClément Bœsch2013-09-161-1/+0
| | | | | | | | | | | | | | | | Since 596e5d4783, this is not necessary anymore. It also allows to actually disable the flushing, improving write performance (but possibly giving worse latency in real-time streaming). Signed-off-by: Martin Storsjö <[email protected]>
* | lavf/avienc: use av_freep() avoid stale pointersMichael Niedermayer2013-09-161-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avienc: Disallow the first frame to be skipedMichael Niedermayer2013-05-221-1/+1
| | | | | | | | | | | | Fixes Ticket2386 Signed-off-by: Michael Niedermayer <[email protected]>
* | lavf: remove some flushing in write_packet muxers callbacks.Clément Bœsch2013-04-141-1/+0
| | | | | | | | | | Since 4f112a8e3, this is not necessary anymore. Also, it allows to actually disable the flushing.
* | avienc: fix overflow of audio sample countTobias Rapp2013-04-111-1/+1
| | | | | | | | | | | | | | Fixes an overflow of the sample count field within the audio stream header chunk if audio stream data exceeds 2GB. Signed-off-by: Michael Niedermayer <[email protected]>
* | lavf/avienc: return proper error codes, and provide some more feedbackStefano Sabatini2012-11-171-8/+16
| |
* | avienc: force a valid timebase for videoMichael Niedermayer2012-11-011-0/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | lavf/avienc: fix/extend error message, in case of too large number of ↵Stefano Sabatini2012-10-311-1/+1
| | | | | | | | skipped frames
* | lavf/avienc: enable debug logStefano Sabatini2012-10-311-2/+6
| |
* | Merge commit '71e92414bfd79e56ea6fff174a665ff7b9b86e68'Michael Niedermayer2012-10-171-22/+2
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '71e92414bfd79e56ea6fff174a665ff7b9b86e68': lavf: move RIFF INFO tag writing from avienc to riff avconv: fix disabling auto mappings with -map_metadata Conflicts: ffmpeg_opt.c libavformat/riff.h Merged-by: Michael Niedermayer <[email protected]>
| * lavf: move RIFF INFO tag writing from avienc to riffVictor Vasiliev2012-10-161-22/+2
| | | | | | | | | | | | It will be useful in the wav muxer. Signed-off-by: Anton Khirnov <[email protected]>
| * avformat: Remove non-compiling and/or silly commented-out printf/av_log ↵Diego Biurrun2012-10-011-2/+0
| | | | | | | | statements
* | Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b'Michael Niedermayer2012-09-161-1/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 <[email protected]>
| * lavf: flush the output AVIOContext in av_write_trailer().Anton Khirnov2012-09-151-1/+0
| | | | | | | | | | | | | | 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.
* | Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer2012-08-071-8/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 <[email protected]>
| * Replace all CODEC_ID_* with AV_CODEC_ID_*Anton Khirnov2012-08-071-6/+6
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-311-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 <[email protected]>
| * Improve descriptiveness of a number of codec and container long namesDiego Biurrun2012-07-301-1/+1
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-231-5/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: v410dec: Implement explode mode support zerocodec: fix direct rendering. wav: init st to NULL to avoid a false-positive warning. wavpack: set bits_per_raw_sample for S32 samples to properly identify 24-bit h264: refactor NAL decode loop RTMPTE protocol support RTMPE protocol support rtmp: Add ff_rtmp_calc_digest_pos() rtmp: Rename rtmp_calc_digest to ff_rtmp_calc_digest and make it global swscale: add missing HAVE_INLINE_ASM check. lavfi: place x86 inline assembly under HAVE_INLINE_ASM. vc1: Add a test for interlaced field pictures swscale: Mark all init functions as av_cold swscale: x86: Drop pointless _mmx suffix from filenames lavf: use conditional notation for default codec in muxer declarations. swscale: place inline assembly bilinear scaler under HAVE_INLINE_ASM. dsputil: ppc: cosmetics: pretty-print dsputil: x86: add SHUFFLE_MASK_W macro configure: respect CC_O setting in check_cc Conflicts: Changelog configure libavcodec/v410dec.c libavcodec/zerocodec.c libavformat/asfenc.c libavformat/version.h libswscale/utils.c libswscale/x86/swscale.c Merged-by: Michael Niedermayer <[email protected]>
| * lavf: use conditional notation for default codec in muxer declarations.Ronald S. Bultje2012-07-221-5/+1
| | | | | | | | | | This removes the use of macro nesting in these code constructs, which makes it easier to parse in pre-processors.
* | avienc: use av_assertMichael Niedermayer2012-06-171-3/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avienc: create xsub in avi files that are closer to whats in the wildMichael Niedermayer2012-05-271-2/+5
| | | | | | | | | | | | Fixes ticket1332 Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-061-2/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: cosmetics: Align muxer/demuxer declarations mpeg12: Do not change frame_pred_frame_dct flag and demote error into a warning avcodec: remove avcodec_guess_channel_layout() avutil: Add av_get_default_channel_layout() Conflicts: doc/APIchanges libavcodec/mpeg12.c libavformat/cdg.c libavformat/matroskaenc.c libavformat/mpegts.c libavformat/nuv.c libavformat/wav.c libavutil/audioconvert.c libavutil/audioconvert.h libavutil/avutil.h Merged-by: Michael Niedermayer <[email protected]>
| * cosmetics: Align muxer/demuxer declarationsMartin Storsjö2012-04-061-2/+4
| | | | | | | | | | | | | | Also add missing trailing commas, break long codec_tag lines and add spaces in codec_tag declarations. Signed-off-by: Martin Storsjö <[email protected]>
* | Fix all GNU %LdMichael Niedermayer2011-12-131-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-011-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 <[email protected]>
| * lavf: make av_set_pts_info private.Anton Khirnov2011-11-301-1/+2
| | | | | | | | It's supposed to be called only from (de)muxers.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-281-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: vc1: use an enum for Frame Coding Mode doc: cleanup filter section indeo3: error out if no motion vector is set. x86inc: Flag shufps as an floating-point instruction for the AVX emulation code. mpegaudio: do not use init_static_data() for initializing tables. musepack: fix signed shift overflow in mpc_read_packet() mov: Make format string match variable type. wmavoice: Make format string match variable type. vc1: select interlaced scan table by FCM element Generalize RIFF INFO tag support; support reading INFO tag in wav pthread: track thread existence in a separate variable. Conflicts: doc/filters.texi libavcodec/pthread.c libavformat/avi.c libavformat/riff.c libavformat/riff.h libavformat/wav.c Merged-by: Michael Niedermayer <[email protected]>
| * Generalize RIFF INFO tag support; support reading INFO tag in wavVictor Vasiliev2011-11-261-3/+3
| | | | | | | | Signed-off-by: Ronald S. Bultje <[email protected]>
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-22 23:21:53 +0000