summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* Merge commit '960aff379da46dcaff61504a57714d4d4e758e41'Michael Niedermayer2014-11-25
|\ | | | | | | | | | | | | | | | | | | * commit '960aff379da46dcaff61504a57714d4d4e758e41': lavf: Use wchar functions for filenames on windows for mkdir/rmdir/rename/unlink Conflicts: libavformat/os_support.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Use wchar functions for filenames on windows for mkdir/rmdir/rename/unlinkMartin Storsjö2014-11-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes sure that the internal utf8 path names are handled properly - the normal file handling functions assume path names are in the native codepage, which isn't utf8. This assumes that the tools outside of lavf don't use the mkdir definition. (The tools don't do the same reading of command line parameters as wchar either - they probably won't handle all possible unicode file parameters properly, but at least work more predictably if no utf8/wchar conversion is involved.) This is moved further down in os_support.h, since windows.h shouldn't be included before winsock2.h, while io.h needs to be included before the manual defines for lseek functions. 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>
* | Merge commit '40665d27e38e6a2f65037878202bd1a398c7683e'Michael Niedermayer2014-11-25
|\| | | | | | | | | | | | | | | | | | | * commit '40665d27e38e6a2f65037878202bd1a398c7683e': flvdec: Document how the duration is retrieved at the end of the file Conflicts: libavformat/flvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flvdec: Document how the duration is retrieved at the end of the fileUwe L. Korn2014-11-24
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/apngdec: transmit all the chunks between consecutive fcTL ones.Benoit Fouet2014-11-24
| | | | | | | | | | | | | | | | In order to support multiple IDAT of fdAT chunks following an fcTL one, transmit all the chunks between two fcTL ones (or between fcTL and IEND one). Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rawdec: raw formats have no timestampswm42014-11-24
| | | | | | | | | | | | | | Some raw demuxers already had AVFMT_NOTIMESTAMPS set. Add it for all the others. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegenc: assert that premux_packet is non nullMichael Niedermayer2014-11-24
| | | | | | | | | | Based on: 065923b0781b06a2604f69f4e2c2407b7750a854 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'fe42f94ce1023f9c2f7e86404c60afcee5b078a9'Michael Niedermayer2014-11-24
|\| | | | | | | | | | | | | * commit 'fe42f94ce1023f9c2f7e86404c60afcee5b078a9': dashenc: Don't segment all video streams when one stream gets a keyframe Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dashenc: Don't segment all video streams when one stream gets a keyframeMartin Storsjö2014-11-24
| | | | | | | | | | | | | | | | | | This makes sure that segments actually start at a keyframe (and makes sure we don't split segments twice in a row, with one segment consisting of only a handful of packets), when one stream uses b-frames while another one doesn't. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '30b8eb0f87b0eaefdc115ef38f8ad87dd3a6e50b'Michael Niedermayer2014-11-24
|\| | | | | | | | | | | | | * commit '30b8eb0f87b0eaefdc115ef38f8ad87dd3a6e50b': sol: simplify sol_codec_id() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * sol: simplify sol_codec_id()Vittorio Giovara2014-11-24
| | | | | | | | Bug-Id: CID 1238993
| * mpegenc: prevent a NULL pointer dereferenceVittorio Giovara2014-11-24
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 29261
* | avformat/rtmpproto: only prepend @setMetaData for onMetaData and ↵Jeffrey Wescott2014-11-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |RtmpSampleAccess In current versions of ffmpeg, when streaming to an RTMP server, anytime a packet of type RTMP_PT_NOTIFY is encountered, the packet is prepended with @setDataFrame before it gets sent to the server. This is incorrect; only packets for onMetaData and |RtmpSampleAccess should invoke @setDataFrame on the RTMP server. Specifically, the current bug manifests itself when trying to stream onTextData or onCuePoint invocations. This fix addresses that problem and ensures that the @setDataFrame is only prepended for onMetaData and |RtmpSampleAccess. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/apngdec: print currently unsupported in-stream tags in a more readable formJames Almer2014-11-23
| | | | | | | | | | | | | | Also use length and not stream position Reviewed-by: Benoit Fouet <benoit.fouet@free.fr> Signed-off-by: James Almer <jamrial@gmail.com>
* | Print a warning if vp6 is muxed into flv: The output is flipped.Carl Eugen Hoyos2014-11-23
| | | | | | | | Fixes ticket #4132.
* | xface: Fix encoder crashes due to too small on-stack array.Reimar Döffinger2014-11-23
| | | | | | | | | | | | Also add a FATE test. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Merge commit 'f856d9c2f314c493c672dfb9c876da182525da3d'Michael Niedermayer2014-11-23
|\| | | | | | | | | | | | | | | | | | | | | * commit 'f856d9c2f314c493c672dfb9c876da182525da3d': dashenc: Don't require the stream bitrate to be known Conflicts: libavformat/dashenc.c See: 5f8fcdd4481b3e740d76b09e10a80e3271ef47b5 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dashenc: Don't require the stream bitrate to be knownMartin Storsjö2014-11-22
| | | | | | | | | | | | | | | | | | | | | | | | | | Don't write any bitrate attribute if it isn't known. As long as one doesn't want automatic bitrate switching, playback can work just fine even if it isn't set. If strict standard compliance is requested, this is still considered an error, since the attribute is mandatory according to the spec. Based on a patch by Rodger Combs. Signed-off-by: Martin Storsjö <martin@martin.st>
| * lavf: Remove a redundant include of sys/stat.hMartin Storsjö2014-11-22
| | | | | | | | | | | | | | The same file already includes this header a few lines further above. Signed-off-by: Martin Storsjö <martin@martin.st>
| * flvenc: Remove an unused variableMichael Niedermayer2014-11-22
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | mxfdec: minor simplification.Reimar Döffinger2014-11-22
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | lavf: fix apngdec under msvc.Matthew Oliver2014-11-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/apngdec: properly skip currently unsupported in-stream tagsJames Almer2014-11-22
| | | | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Reviewed-by: Benoit Fouet <benoit.fouet@free.fr> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavformat/mxfdec.c: export source package uids and names as metadataMark Reid2014-11-22
| | | | | | | | | | | | | | | | Changes since v1: * renamed mxf_read_source_package -> mxf_read_package v1 reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'fd9badd3cb3b60f5c54dcea35523e1ecca2f67a6'Michael Niedermayer2014-11-21
|\| | | | | | | | | | | | | | | | | | | | | * commit 'fd9badd3cb3b60f5c54dcea35523e1ecca2f67a6': xwma: Do not leak on failure path Conflicts: libavformat/xwma.c See: 375a0c03a9a401a328a94b3d9f5338ab1524f7ef Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * xwma: Do not leak on failure pathLuca Barbato2014-11-21
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 1087092
* | avformat/apngdec: add APNG demuxer.Benoit Fouet2014-11-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: replace some odd 30-60 rates by higher less odd ones in ↵Michael Niedermayer2014-11-21
| | | | | | | | | | | | | | | | get_std_framerate() Fixes Ticket4012 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avidec: fix handling dv in aviMichael Niedermayer2014-11-21
| | | | | | | | | | | | Fixes Ticket4086 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/mux: Always call write_trailer() from av_write_trailer() to avoid a leak.Carl Eugen Hoyos2014-11-20
| | | | | | | | Fixes ticket #4049.
* | avformat/dtsdec: dts_probe: check reserved bit, check lfe, check sr_code ↵Michael Niedermayer2014-11-20
| | | | | | | | | | | | | | | | | | similarity Fixes misdetection of s16le Fixes Ticket4109 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '7fd10f66b722eccc2ada9128766d002f6d751f79'Michael Niedermayer2014-11-19
|\| | | | | | | | | | | | | * commit '7fd10f66b722eccc2ada9128766d002f6d751f79': hdsenc: Clear the previous codec tag when setting up the chained muxer Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hdsenc: Clear the previous codec tag when setting up the chained muxerMartin Storsjö2014-11-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The chained flv muxer wants one set of tags - normally this set could be signaled via the AVOutputFormat codec_tag field (as smoothstreamingenc and dashenc do). hdsenc doesn't signal it, since the FLV codec tag arrays aren't exported from flvenc.c. This can lead to the caller keeping an original codec tag from the originating container here, which would then be a mismatch for the FLV muxer. Since we don't really care about what codec tag the caller might have set, just clear it and let the lavf muxer layer set the right one for the chained FLV muxer later instead. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'f918b8a2933a65020cbe490ec637d5485c11a692'Michael Niedermayer2014-11-19
|\| | | | | | | | | | | | | * commit 'f918b8a2933a65020cbe490ec637d5485c11a692': hdsenc: Use the right filename in an error message Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hdsenc: Use the right filename in an error messageMartin Storsjö2014-11-19
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | 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>
* | lavf/concatdec: add timestamp logStefano Sabatini2014-11-19
| | | | | | | | Help debugging timestamp conversion issues.
* | avformat/mpegtsenc: change the min value for mpegts_start_pid to allow ATSC PIDsdedicatedbroadcastsolutions2014-11-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dashenc: degrade gracefully if a stream's bitrate is unavailableRodger Combs2014-11-18
| | | | | | | | | | | | | | If a stream's bitrate is not set, this attempts to use its rc_max_rate; if neither is set, it avoids writing a bandwidth attribute at all. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/ffmenc: fix memleak in ffm_write_headerJames Almer2014-11-18
| | | | | | | | | | | | | | | | Regression since 745730c9c208c40f800d5d71ffa39aceab6ce044. The dynamic buffer was not being used or freed. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat/mp3dec: avoid seeking to negative positionsMichael Niedermayer2014-11-18
| | | | | | | | | | | | Fixes Ticket4038 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '2007082d2db25f9305b8a345798b840ea7784fdb'Michael Niedermayer2014-11-18
|\| | | | | | | | | | | | | | | | | | | | | * commit '2007082d2db25f9305b8a345798b840ea7784fdb': mov: check ff_get_wav_header() return value Conflicts: libavformat/mov.c See: 6d55a40b00801899f7975b22401bdd96bbc228af Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: check ff_get_wav_header() return valueVittorio Giovara2014-11-18
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 717497
| * librtmp: append the correct field to the stringVittorio Giovara2014-11-18
| | | | | | | | | | | | | | Also prevent a NULL pointer dereference. CC: libav-stable@libav.org Bug-Id: CID 1250329 / CID 1250331
* | Merge commit '9257692ac15eff7b07540c1f61cebde0d8823fbd'Michael Niedermayer2014-11-18
|\| | | | | | | | | | | | | | | | | | | * commit '9257692ac15eff7b07540c1f61cebde0d8823fbd': lavf: Only initialize s->offset once when using avoid_negative_ts make_zero Conflicts: libavformat/mux.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Only initialize s->offset once when using avoid_negative_ts make_zeroMartin Storsjö2014-11-17
| | | | | | | | | | | | | | | | | | | | When given a stream starting at dts=0, it would previously consider s->offset as uninitialized and set an offset when the second packet was written, ending up writing two packets with dts=0. By initializing this field to AV_NOPTS_VALUE, we make sure that we only initialize it once, on the first packet. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'c302d034ba2690a935df8bf7e4f5d44ed86e8d5c'Michael Niedermayer2014-11-17
|\| | | | | | | | | | | | | | | | | | | * commit 'c302d034ba2690a935df8bf7e4f5d44ed86e8d5c': tools: Add a sidxindex tool Conflicts: libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-05 04:05:59 +0000