summaryrefslogtreecommitdiff
path: root/libavformat/movenc.c
Commit message (Collapse)AuthorAge
* avformat/movenc: add EAC3 muxing support.Benoit Fouet2014-10-10
| | | | | | | | | Support only one independent substream right now, and only syncframes containing 6 blocks. Fixes part of ticket #3074 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/movenc: automatically set AVC-Intra tagMichael Niedermayer2014-10-01
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/movenc: AVC Intra supportMichael Niedermayer2014-10-01
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '4d55e9de27894ddfb337b28cd7aa6d14a12666d2'Michael Niedermayer2014-09-04
|\ | | | | | | | | | | | | | | | | | | * commit '4d55e9de27894ddfb337b28cd7aa6d14a12666d2': vc1: Split bits used in libavformat into a separate header Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1: Split bits used in libavformat into a separate headerDiego Biurrun2014-09-04
| | | | | | | | This reduces inter-library dependencies.
* | align and correct messages regarding bitstream filtersMoritz Barsnick2014-08-19
| | | | | | | | | | | | | | The messages regarding the recommended use of bitstream filters are somewhat different. This also adds the ":v" stream specifier to "-bsf h264_mp4toannexb". Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867'Michael Niedermayer2014-08-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867': cosmetics: Write NULL pointer inequality checks more compactly Conflicts: libavcodec/dvdsubdec.c libavcodec/h263dec.c libavcodec/libxvid.c libavcodec/rv10.c libavcodec/utils.c libavformat/format.c libavformat/matroskadec.c libavformat/segment.c libavutil/opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Write NULL pointer inequality checks more compactlyGabriel Dume2014-08-15
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'Michael Niedermayer2014-08-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39': cosmetics: Write NULL pointer equality checks more compactly Conflicts: cmdutils.c ffmpeg_opt.c ffplay.c libavcodec/dvbsub.c libavcodec/dvdsubdec.c libavcodec/dvdsubenc.c libavcodec/dxa.c libavcodec/libxvid_rc.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/rv10.c libavcodec/tiffenc.c libavcodec/utils.c libavcodec/vc1dec.c libavcodec/zmbv.c libavdevice/v4l2.c libavformat/matroskadec.c libavformat/movenc.c libavformat/sdp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Write NULL pointer equality checks more compactlyGabriel Dume2014-08-15
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | avformat/movenc: Fix printf typeMichael Niedermayer2014-08-11
| | | | | | | | | | Found-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: check that reel_name length doesn't exceed UINT16_MAXMark Reid2014-08-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: write reel_name metadata to tmcd atomMark Reid2014-08-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: XMP metadata support.Marek Fort2014-08-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'b50173a4dd47b9c3c89845b781fa958ccf860929'Michael Niedermayer2014-08-07
|\| | | | | | | | | | | | | * commit 'b50173a4dd47b9c3c89845b781fa958ccf860929': movenc: fix QT chapter track character encoding Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: fix QT chapter track character encodingJohn Stebbins2014-08-06
| | | | | | | | An encoding ("encd") box is required to tell QT that the string is UTF8
* | Merge commit 'da9cc22d5bd5f59756c2037b02966376da2cf323'Michael Niedermayer2014-08-07
|\| | | | | | | | | | | | | | | | | | | * commit 'da9cc22d5bd5f59756c2037b02966376da2cf323': movenc: add track title to tracks Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: add track title to tracksJohn Stebbins2014-08-06
| |
* | Merge commit 'd9432789bd119f0e37bcf65cebda05d36aafd4ed'Michael Niedermayer2014-08-07
|\| | | | | | | | | | | | | | | | | | | * commit 'd9432789bd119f0e37bcf65cebda05d36aafd4ed': movenc: remove pointless loop around BITEXACT test Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: remove pointless loop around BITEXACT testJohn Stebbins2014-08-06
| |
* | Merge commit '0897d2fdc7755849c3ae58d8b543ef734c200d3c'Michael Niedermayer2014-08-05
|\| | | | | | | | | | | | | | | | | | | * commit '0897d2fdc7755849c3ae58d8b543ef734c200d3c': movenc: Add option to disable nero chapters Conflicts: doc/muxers.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Add option to disable nero chaptersJohn Stebbins2014-08-05
| | | | | | | | | | | | | | And add flag to muxer documentation. Nero chapters break some taggers (mp3tag and iTunes). Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | avformat/movenc: add m4b to list of ipod playable filesgerion.entrup@t-online.de2014-07-30
| | | | | | | | m4b is the extension used by iDevices to detect audiobooks.
* | Write valid free atom when -moov_size is specified.Carl Eugen Hoyos2014-07-18
| | | | | | | | Fixes ticket #3769.
* | avformat/movenc: dont mark multichannel as mono tracks as containing the ↵Michael Niedermayer2014-07-14
| | | | | | | | | | | | | | | | center channel Fixes Ticket3727 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'df2aa22203afc9377832bdf800df5dbd3aa9687e'Michael Niedermayer2014-07-11
|\| | | | | | | | | | | | | | | | | | | * commit 'df2aa22203afc9377832bdf800df5dbd3aa9687e': mov: Clarify tkhd flag settings Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Clarify tkhd flag settingsLuca Barbato2014-07-11
| |
* | Merge commit 'f90729699db9ede2bef2b28000f1795dab1b8996'Michael Niedermayer2014-07-11
|\| | | | | | | | | | | | | | | | | | | * commit 'f90729699db9ede2bef2b28000f1795dab1b8996': mov: Do not group tracks if more than one is enabled per type Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Do not group tracks if more than one is enabled per typeLuca Barbato2014-07-11
| | | | | | | | The specification requires at most 1 track enabled per alternate group.
* | avformat/movenc: respect color_range when encoding dnxhd.Mark Boorer2014-07-09
| | | | | | | | | | | | Set the ACLR atom appropriately for legal / full range. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: check that the video resolution is supportedMichael Niedermayer2014-07-08
| | | | | | | | | | | | Resolutions are stored as 16bit integers 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).
* | avformat/movenc: use av_malloc(z)_array()Michael Niedermayer2014-06-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'cf6977712c9e5abe6dc55289f6322ccbf10321a9'Michael Niedermayer2014-05-29
|\| | | | | | | | | | | | | * commit 'cf6977712c9e5abe6dc55289f6322ccbf10321a9': movenc: write avg_frame_rate as the framerate, not the codec timebase Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: write avg_frame_rate as the framerate, not the codec timebaseAnton Khirnov2014-05-29
| |
* | avformat/movenc: Check that packet duration is valid in ff_mov_write_packet()Michael Niedermayer2014-05-23
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '0ba5299a805e9ccaef1a757381fc2ada4d54b8a1'Michael Niedermayer2014-05-18
|\| | | | | | | | | | | | | | | | | | | | | * commit '0ba5299a805e9ccaef1a757381fc2ada4d54b8a1': movenc: use the "encoder" metadata tag to write stsd Compressorname Conflicts: libavformat/movenc.c libavformat/movenc.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: use the "encoder" metadata tag to write stsd CompressornameAnton Khirnov2014-05-18
| | | | | | | | | | This mirrors the demuxer behaviour and avoids accessing AVCodecContext.codec, which should not be done in muxers.
* | Merge commit '0c1959b056f6ccaa2eee2c824352ba93c8e36d52'Michael Niedermayer2014-05-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0c1959b056f6ccaa2eee2c824352ba93c8e36d52': lavf: add AVFMT_FLAG_BITEXACT. Conflicts: doc/APIchanges libavformat/avformat.h libavformat/flacenc.c libavformat/movenc.c libavformat/oggenc.c libavformat/options_table.h libavformat/version.h tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: add AVFMT_FLAG_BITEXACT.Anton Khirnov2014-05-15
| | | | | | | | | | | | | | | | Use it instead of checking CODEC_FLAG_BITEXACT in the first stream's codec context. Using codec options inside lavf is fragile and can easily break when the muxing codec context is not the encoding context.
* | avformat/movenc: Check ff_put_wav_header() return codeMichael Niedermayer2014-05-10
| | | | | | | | | | Fixes CID1212260 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | 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>
* | avformat/movenc: dont store invalid tapt atomMichael Niedermayer2014-04-25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '99e22b7859177f6d3ed6121040924b337dce5497'Michael Niedermayer2014-04-25
|\| | | | | | | | | | | | | | | | | | | | | * commit '99e22b7859177f6d3ed6121040924b337dce5497': mov: Emit the correct tags for clcp tracks Conflicts: libavformat/movenc.c See: a5f6720f13c7678c61be1413debf3e11e678781c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Emit the correct tags for clcp tracksMiles Gould2014-04-25
| | | | | | | | | | | | Bug-Id: 664 Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * mov: Write prof section of tapt tagAidan Skinner2014-04-25
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | 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 'cba4e6062a02d5bf684e13a770be88aa1fec717e'Michael Niedermayer2014-04-02
|\| | | | | | | | | | | | | | | | | | | | | * commit 'cba4e6062a02d5bf684e13a770be88aa1fec717e': More correct printf format specifiers Conflicts: libavcodec/h264_ps.c libavcodec/h264_refs.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * More correct printf format specifiersDiego Biurrun2014-04-02
| | | | | | | | This avoids compiler warnings about argument and specifier type mismatch.