summaryrefslogtreecommitdiff
path: root/libavformat/smoothstreamingenc.c
Commit message (Collapse)AuthorAge
* 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
| |
| * smoothstreamingenc: Add a missing "goto fail"Michael Niedermayer2015-01-19
| | | | | | | | | | | | | | | | This goto wasn't necessary originally, but it should have been added when the write_manifest call was added in 8e276378. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/smoothstreamingenc: Add missing "goto fail"Michael Niedermayer2015-01-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/smoothstreamingenc: Use av_freep() avoid leaving stale pointers in ↵Michael Niedermayer2014-12-25
| | | | | | | | | | | | memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '675ac56b7ee0f204963fde55295197c5df80aa91'Michael Niedermayer2014-11-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '675ac56b7ee0f204963fde55295197c5df80aa91': Revert "lavf: Don't try to update files atomically with renames on windows" Conflicts: libavformat/dashenc.c libavformat/hdsenc.c libavformat/internal.h libavformat/smoothstreamingenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Revert "lavf: Don't try to update files atomically with renames on windows"Martin Storsjö2014-11-27
| | | | | | | | | | | | | | | | | | This reverts commit b9d08c77a44390b0848c06f20bc0e9e951ba6a3c. After taking MoveFileEx into use, we can replace files with renames on windows as well. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'b9d08c77a44390b0848c06f20bc0e9e951ba6a3c'Michael Niedermayer2014-11-25
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b9d08c77a44390b0848c06f20bc0e9e951ba6a3c': lavf: Don't try to update files atomically with renames on windows Conflicts: libavformat/dashenc.c libavformat/hdsenc.c libavformat/internal.h libavformat/smoothstreamingenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Don't try to update files atomically with renames on windowsMartin Storsjö2014-11-24
| | | | | | | | | | | | | | | | | | On windows, rename(2) will fail if the target file exists. On unix this trick is used to make sure that people reading the file either will get the full previous file, or the full new version of the file, but no intermediate version. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat: Read errno before av_log() as the callback from av_log() might ↵Michael Niedermayer2014-10-25
| | | | | | | | | | | | affect errno Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: Print error message on failure of ff_rename()Michael Niedermayer2014-10-25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '7785ce1c769369abf85b276148548a5510aabb5f'Michael Niedermayer2014-10-25
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '7785ce1c769369abf85b276148548a5510aabb5f': lavf: replace rename() with ff_rename() Conflicts: libavformat/hdsenc.c libavformat/internal.h See: 95d2fc6a76f3e0a98329f1ca70f98e7c085f0abf Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: replace rename() with ff_rename()Luca Barbato2014-10-24
| | | | | | | | | | | | | | | | | | The new function wraps errno so that its value is correctly reported when other functions overwrite it (eg. in case of logging). CC: libav-stable@libav.org Bug-Id: CID 1135748 Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'e73d26bbd65f1ac5fc73ef3fd24cab1bed8ba2e2'Michael Niedermayer2014-10-21
|\| | | | | | | | | | | | | | | | | | | | | * commit 'e73d26bbd65f1ac5fc73ef3fd24cab1bed8ba2e2': smoothstreamingenc: explict cast to avoid overflow Conflicts: libavformat/smoothstreamingenc.c See: b399816d9c3d0fc3efd742b04f269c1055cc6e2b Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * smoothstreamingenc: explict cast to avoid overflowVittorio Giovara2014-10-21
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 732248
* | Merge commit '8bef43388132b53f59a6e90add18900a3bb4cc60'Michael Niedermayer2014-10-12
|\| | | | | | | | | | | | | * commit '8bef43388132b53f59a6e90add18900a3bb4cc60': smoothstreamingenc: Simplify code by removing a redundant variable Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * smoothstreamingenc: Simplify code by removing a redundant variableMartin Storsjö2014-10-12
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '28816050e47b6dba430a52e429d21a864cffda8e'Michael Niedermayer2014-10-07
|\| | | | | | | | | | | | | | | | | | | * commit '28816050e47b6dba430a52e429d21a864cffda8e': lavf: Set the stream time base hint properly for chained muxers Conflicts: libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Set the stream time base hint properly for chained muxersMartin Storsjö2014-10-06
| | | | | | | | | | | | | | This avoids warnings about using the codec time base as time base hint. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '803e82276b3716bf6012ec69e8854dae14a4fd2b'Michael Niedermayer2014-09-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '803e82276b3716bf6012ec69e8854dae14a4fd2b': libavformat: Check mkdir return error codes Conflicts: libavformat/hdsenc.c libavformat/smoothstreamingenc.c See: c89f8f80cc83622471eaf99e451e78df68475e19 See: a3886ea3c5947ca05bfe01b053d9ce2f9725d9eb Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libavformat: Check mkdir return error codesMartin Storsjö2014-09-07
| | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the returned error codes were intentionally ignored (see fadd3a68213), to avoid aborting if the directory already existed. If the mkdir actually failed, this was caught when opening files within the directory fails anyway. By handling the error code here (but explicitly ignoring EEXIST), the error messages and return codes in these cases are more appropriate and less confusing. Signed-off-by: Martin Storsjö <martin@martin.st>
| * smoothstreamingenc: Fix a memory leak on errorsMichael Niedermayer2014-07-07
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Use new av_dict_set_int helper function.Reimar Döffinger2014-08-16
| | | | | | | | | | | | | | Get rid of the many, slightly differing, implementations of basically the same thing. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | avformat/mux: support re-interleaving packets in ff_write_chained()Michael Niedermayer2014-07-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/smoothstreamingenc: fix memleakMichael Niedermayer2014-07-06
| | | | | | | | | | Fixes CID1224285 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/smoothstreamingenc: Use av_mallocz_array()Michael Niedermayer2014-06-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'e0d01dc7d7fc3ce4c23f286a10870e9599c8b8b9'Michael Niedermayer2014-05-25
|\| | | | | | | | | | | | | * commit 'e0d01dc7d7fc3ce4c23f286a10870e9599c8b8b9': smoothstream: check malloc calls Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * smoothstream: check malloc callsNidhi Makhijani2014-05-24
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | 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>
* | 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>
* | Merge commit '310cc4bf82824f09bdd0b9147ed725cdbeaf9bdd'Michael Niedermayer2013-08-28
|\| | | | | | | | | | | | | * commit '310cc4bf82824f09bdd0b9147ed725cdbeaf9bdd': smoothstreamingenc: Write to a temp file while updating the manifest Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * smoothstreamingenc: Write to a temp file while updating the manifestMartin Storsjö2013-08-27
| | | | | | | | | | | | | | | | If a client tries to read the file while it's being updated, the client would get an incomplete manifest. Instead write to a separate temp file and atomically rename it to replace the previous one. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/smoothstreamingenc: Make const tables static constMichael Niedermayer2013-08-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'Michael Niedermayer2012-12-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '511cf612ac979f536fd65e14603a87ca5ad435f3': miscellaneous typo fixes Conflicts: libavcodec/4xm.c libavcodec/lagarith.c libavcodec/parser.c libavcodec/ratecontrol.c libavcodec/shorten.c libavcodec/vda_h264.c libavformat/dvenc.c libavformat/wtv.c tools/patcheck Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * miscellaneous typo fixesDiego Biurrun2012-12-21
| |
* | smoothstreamingenc: check return value of mkdir()Michael Niedermayer2012-10-29
| | | | | | | | | | Fixes CID732188 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | smoothstreamingenc: fix integer overflowMichael Niedermayer2012-10-29
| | | | | | | | | | Fixes CID732248 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avutil: Make LZO decoder code configure-time selectable avutil: Move memcpy_backptr() to mem.c configure: detect parisc64 automatically configure: detect ppc64 automatically configure: detect mips64 automatically configure: generalise 64-bit test smoothstreamingenc: Don't assume streams start from timestamp 0 Conflicts: configure libavutil/Makefile libavutil/lzo.c libavutil/lzo.h libavutil/mem.c libavutil/mem.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * smoothstreamingenc: Don't assume streams start from timestamp 0Martin Storsjö2012-10-24
| | | | | | | | | | | | Also use dts instead of pts for deciding where to split fragments. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-07
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: wmaenc: use float planar sample format (e)ac3enc: use planar sample format aacenc: use planar sample format adpcmenc: use planar sample format for adpcm_ima_wav and adpcm_ima_qt adpcmenc: move 'ch' variable to higher scope adpcmenc: fix 3 instances of variable shadowing adpcm_ima_wav: simplify encoding libvorbis: use planar sample format libmp3lame: use planar sample formats vorbisenc: use float planar sample format ffm: do not write or read the audio sample format parseutils: fix parsing of invalid alpha values doc/RELEASE_NOTES: update for the 9 release. smoothstreamingenc: Add a more verbose error message smoothstreamingenc: Ignore the return value from mkdir smoothstreamingenc: Try writing a manifest when opening the muxer smoothstreamingenc: Move the output_chunk_list and write_manifest functions up smoothstreamingenc: Properly return errors from ism_flush to the caller smoothstreamingenc: Check the output UrlContext before accessing it Conflicts: doc/RELEASE_NOTES libavcodec/aacenc.c libavcodec/ac3enc_template.c libavcodec/wmaenc.c tests/ref/lavf/ffm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * smoothstreamingenc: Add a more verbose error messageMartin Storsjö2012-10-06
| | | | | | | | | | | | This helps tracking down the cause if this happens to be an issue. Signed-off-by: Martin Storsjö <martin@martin.st>
| * smoothstreamingenc: Ignore the return value from mkdirMartin Storsjö2012-10-06
| | | | | | | | | | | | | | | | We don't need to return an error if the directory already existed. We make sure that the directory actually is properly writeable later within ism_write_header by writing a manifest anyway. Signed-off-by: Martin Storsjö <martin@martin.st>
| * smoothstreamingenc: Try writing a manifest when opening the muxerMartin Storsjö2012-10-06
| | | | | | | | | | | | | | This allows failing cleaner and earlier if unable to write to the output directory. Signed-off-by: Martin Storsjö <martin@martin.st>
| * smoothstreamingenc: Move the output_chunk_list and write_manifest functions upMartin Storsjö2012-10-06
| | | | | | | | | | | | | | This allows calling write_manifest from ism_write_header without a forward declaration. Signed-off-by: Martin Storsjö <martin@martin.st>
| * smoothstreamingenc: Properly return errors from ism_flush to the callerMartin Storsjö2012-10-06
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * smoothstreamingenc: Check the output UrlContext before accessing itMartin Storsjö2012-10-06
| | | | | | | | | | | | | | This code can be called with a NULL UrlContext if writing of the trailer involves seeking. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-09-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rtp: Packetization of JPEG (RFC 2435) smoothstreamingenc: Copy the SAR on the AVStreams as well Conflicts: Changelog libavformat/rtpenc.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * smoothstreamingenc: Copy the SAR on the AVStreams as wellMartin Storsjö2012-09-23
| | | | | | | | | | | | This is required in chained muxers, if the SAR happens to be set. Signed-off-by: Martin Storsjö <martin@martin.st>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-21 11:25:42 +0000