summaryrefslogtreecommitdiff
path: root/libavformat/avienc.c
Commit message (Collapse)AuthorAge
* avformat/avienc: add muxer option "write_channel_mask"Tobias Rapp2015-09-12
| | | | | | | Allow writing an empty channel mask into the wave format header. Useful if the input file contains an unknown channel layout. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Replace av_dlog with ff_dlog.Ronald S. Bultje2015-08-18
| | | | | ff_dlog checks compilability, and is non-public. av_dlog is deprecated and no longer exists if FF_API_DLOG=0.
* avformat/avienc: Correct possible dereference of nullRoman Savchenko2015-05-29
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/avienc: Avoid float usageMichael Niedermayer2015-05-23
| | | | | | reduces risk for rounding differences between platforms Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/avienc: Expand master ODML index when its end is reachedMichael Niedermayer2015-03-19
| | | | | | | Fixes 256Gb limit Fixes Ticket4225 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/avienc: Fix wrongly placed commentMichael Niedermayer2015-03-19
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/avienc: factor out update_odml_entry()Michael Niedermayer2015-03-19
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/avienc: factor write_odml_master() outMichael Niedermayer2015-03-19
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* libavformat/avienc: Fix duration of audio segment in OpenDML master indexTobias Rapp2015-03-04
| | | | | | | | | | | Fixes the duration field of the OpenDML master index "indx" chunk to contain the number of samples instead of the number of packets for (linear/PCM) audio streams. This matches the OpenDML V1.02 standard text which states that the duration field shall contain "time span in stream ticks". Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'Michael Niedermayer2015-02-14
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e': avformat: Don't anonymously typedef structs Conflicts: libavformat/adtsenc.c libavformat/aiffenc.c libavformat/avidec.c libavformat/gif.c libavformat/iff.c libavformat/img2dec.c libavformat/jvdec.c libavformat/matroskadec.c libavformat/udp.c libavformat/wtvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Don't anonymously typedef structsDiego Biurrun2015-02-14
| |
* | avformat/avienc: write last frame durationMichael Niedermayer2014-11-19
| | | | | | | | | | | | Fixes small part of Ticket 3052 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avienc: factor frame skip code outMichael Niedermayer2014-11-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavformat/avienc: Make unchanged function arguments constMichael Niedermayer2014-09-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avienc: Dont search for startcodes in inserted empty avi framesMichael Niedermayer2014-09-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '194be1f43ea391eb986732707435176e579265aa'Michael Niedermayer2014-06-18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '194be1f43ea391eb986732707435176e579265aa': lavf: switch to AVStream.time_base as the hint for the muxer timebase Conflicts: doc/APIchanges libavformat/filmstripenc.c libavformat/movenc.c libavformat/mxfenc.c libavformat/oggenc.c libavformat/swf.h libavformat/version.h tests/ref/lavf/mkv Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: switch to AVStream.time_base as the hint for the muxer timebaseAnton Khirnov2014-06-18
| | | | | | | | | | | | | | | | | | | | | | | | Previously, AVStream.codec.time_base was used for that purpose, which was quite confusing for the callers. This change also opens the path for removing AVStream.codec. The change in the lavf-mkv test is due to the native timebase (1/1000) being used instead of the default one (1/90000), so the packets are now sent to the crc muxer in the same order in which they are demuxed (previously some of them got reordered because of inexact timestamp conversion).
* | Merge commit 'd754ed41727b1fcbab335b510248a9758a73320c'Michael Niedermayer2014-06-18
|\| | | | | | | | | | | | | | | | | | | * commit 'd754ed41727b1fcbab335b510248a9758a73320c': riffenc: take an AVStream instead of an AVCodecContext Conflicts: libavformat/nutenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riffenc: take an AVStream instead of an AVCodecContextAnton Khirnov2014-06-18
| | | | | | | | | | | | 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-23
| | | | | | | | Fixes ticket #3638.
* | Set dwSuggestBufferSize to largest chunk size for every stream in avi.Carl Eugen Hoyos2014-05-19
| | | | | | | | | | | | | | 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-18
|\| | | | | | | | | | | | | | | | | | | * commit 'c3311d472a7528c67f76d0d061704ae70a99b32e': avienc: sanitize variable naming in write_header() Conflicts: libavformat/avienc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avienc: sanitize variable naming in write_header()Anton Khirnov2014-05-18
| | | | | | | | | | | | 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-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <michaelni@gmx.at>
* | Fix writing RGB 5:5:5 rawvideo into avi.Carl Eugen Hoyos2014-04-14
| | | | | | | | 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-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-04
|\| | | | | | | | | | | | | | | | | | | * commit '3407172b36a93cec410c6a287dbeec0f41257512': avienc: K&R formatting cosmetics Conflicts: libavformat/avienc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avienc: K&R formatting cosmeticsKeiji Costantini2014-03-04
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | lavf/avienc: cosmetic indentJames Darnley2014-01-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/avienc: use metadata_header_paddingJames Darnley2014-01-24
| | | | | | | | | | | | | | | | 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 <michaelni@gmx.at>
* | riffenc: add option to ff_put_bmp_header to ignore extradataPeter Ross2013-12-23
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavf/avienc: store language metadata for XSUB streamsErik Olofsson2013-11-09
| | | | | | | | | | | | | | | | | | | | 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 <eaj.olofsson@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-09
|\| | | | | | | | | | | | | * qatar/master: avienc: drop the vfr flag. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avienc: drop the vfr flag.Anton Khirnov2013-11-08
| | | | | | | | | | AVI does not really support vfr properly, only by padding with null packets.
* | Merge commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9'Michael Niedermayer2013-09-27
|\| | | | | | | | | | | | | | | | | | | * commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9': lavf: Reset the entry count and allocation size variables on av_reallocp failures Conflicts: libavformat/avienc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Reset the entry count and allocation size variables on av_reallocp ↵Martin Storsjö2013-09-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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ö <martin@martin.st>
* | avformat/avienc: remove unused variableMichael Niedermayer2013-09-20
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '5626f994f273af80fb100d4743b963304de9e05c'Michael Niedermayer2013-09-19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 <michaelni@gmx.at>
| * avformat: Use av_reallocp() where suitableAlexandra Khirnova2013-09-18
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * lavf: Don't explicitly flush after each written packet in muxersClément Bœsch2013-09-16
| | | | | | | | | | | | | | | | 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ö <martin@martin.st>
* | lavf/avienc: use av_freep() avoid stale pointersMichael Niedermayer2013-09-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avienc: Disallow the first frame to be skipedMichael Niedermayer2013-05-22
| | | | | | | | | | | | Fixes Ticket2386 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: remove some flushing in write_packet muxers callbacks.Clément Bœsch2013-04-14
| | | | | | | | | | Since 4f112a8e3, this is not necessary anymore. Also, it allows to actually disable the flushing.
* | avienc: fix overflow of audio sample countTobias Rapp2013-04-11
| | | | | | | | | | | | | | 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 <michaelni@gmx.at>
* | lavf/avienc: return proper error codes, and provide some more feedbackStefano Sabatini2012-11-17
| |
* | avienc: force a valid timebase for videoMichael Niedermayer2012-11-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/avienc: fix/extend error message, in case of too large number of ↵Stefano Sabatini2012-10-31
| | | | | | | | skipped frames
* | lavf/avienc: enable debug logStefano Sabatini2012-10-31
| |
* | Merge commit '71e92414bfd79e56ea6fff174a665ff7b9b86e68'Michael Niedermayer2012-10-17
|\| | | | | | | | | | | | | | | | | | | | | | | * 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 <michaelni@gmx.at>
| * lavf: move RIFF INFO tag writing from avienc to riffVictor Vasiliev2012-10-16
| | | | | | | | | | | | It will be useful in the wav muxer. Signed-off-by: Anton Khirnov <anton@khirnov.net>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-12 21:33:36 +0000