summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
...
* | avformat/rmdec: rm_read_extradata: add error message for oversized extradataMichael Niedermayer2014-12-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1c77ead1fb14d64e6798fc5e32af04abcb3cebb4'Michael Niedermayer2014-12-06
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '1c77ead1fb14d64e6798fc5e32af04abcb3cebb4': rm: Use the correct codec_data_size signedness Conflicts: libavformat/rm.h libavformat/rmdec.c See: a6f730730b82645a9d31aad0968487cb77d6946c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rm: Use the correct codec_data_size signednessLuca Barbato2014-12-04
| | | | | | | | | | | | | | | | | | The function takes a size and not an offset. CC: libav-stable@libav.org Sample-Id: rm_deadlock.rm Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * mkv: Validate ASS Start and End fieldsLuca Barbato2014-12-03
| | | | | | | | CC: libav-stable@libav.org
| * Drop the unofficial extension prefix for MPEG and MPEG-TS formatsFlorent Le Coz2014-12-02
| | | | | | | | | | | | | | | | As per the RFCs: http://tools.ietf.org/html/rfc3555#page-38 http://tools.ietf.org/html/rfc3003 CC: libav-stable@libav.org
| * mpegtsenc: recognize .mts as MPEG Transport StreamJean-Baptiste Mardelle2014-12-02
| |
* | avformat/mpegts: fix Opus stream countRafaël Carré2014-12-05
| | | | | | | | | | | | That number represents the number of streams, not the number of channels Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavformat/mxfdec.c refactor resolving MultiDescriptor and remove essence ↵Mark Reid2014-12-04
| | | | | | | | | | | | | | | | | | | | group hack I think this is a better way to deal with single frame essence data then my previous way. Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | replaced av_dv_codec_profile by av_dv_codec_profile2 in encoder and dv muxersSteve Jiekak2014-12-04
| | | | | | | | | | Signed-off-by: Steve Jiekak <devaureshy@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix standalone compilation of the iec61883 input device.Carl Eugen Hoyos2014-12-04
| |
* | lavf/oggenc: use meaningful error codesLukasz Marek2014-12-03
| | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | avformat/rmdec: Check codec_data_sizeMichael Niedermayer2014-12-03
| | | | | | | | | | | | | | Fixes infinite loop Fixes Ticket4154 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/aviobuf: Fix infinite loop in ff_get_line()Michael Niedermayer2014-12-03
| | | | | | | | | | | | Fixes ticket4152 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Support muxing 4k AVC Intra in mov.Carl Eugen Hoyos2014-12-02
| | | | | | | | Reported and tested by Rens Dijkshoorn, rens onlinemedia nl
* | Merge commit '8f8caca2242e1fe05f37493cfabcd3f4de198550'Michael Niedermayer2014-12-02
|\| | | | | | | | | | | | | | | | | | | | | * commit '8f8caca2242e1fe05f37493cfabcd3f4de198550': Add support for BDAV/m2ts-mode muxing Conflicts: libavformat/mpegtsenc.c See: 09a858da7d5535e78e9cf942a468aec411ffbf19 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add support for BDAV/m2ts-mode muxingFredrik Axelsson2014-12-02
| | | | | | | | | | Signed-off-by: Fredrik Axelsson <fraxbe@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '3cec81f4d4f26b62bc2d22bb450bbf51ec3a7f09'Michael Niedermayer2014-12-02
|\| | | | | | | | | | | | | | | | | | | | | * commit '3cec81f4d4f26b62bc2d22bb450bbf51ec3a7f09': mov: allocate the tag value dynamically Conflicts: libavformat/mov.c See: f31445a82d6acd0b8fab5a26c04e91645f4854d8 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: allocate the tag value dynamicallyThilo Borgmann2014-12-02
| | | | | | | | | | | | | | | | This allows to load metadata entries longer than 1024 bytes. Displaying them is still limited to 1024 characters, but applications can load them fully now. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'e352b293712ff7cbde67eba3ce3f8510b037de09'Michael Niedermayer2014-12-02
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'e352b293712ff7cbde67eba3ce3f8510b037de09': mov: Add an option for exporting all metadata Conflicts: libavformat/isom.h libavformat/mov.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Add an option for exporting all metadataVittorio Giovara2014-12-02
| |
* | Merge commit '5639ed9abb58311f82cf3499b682d228290adb09'Michael Niedermayer2014-12-02
|\| | | | | | | | | | | | | | | | | | | * commit '5639ed9abb58311f82cf3499b682d228290adb09': mov: do not truncate the language-prefixed tag Conflicts: libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: do not truncate the language-prefixed tagVittorio Giovara2014-12-02
| |
* | Merge commit '604c9b1196c70d79bbbc1f23e75f6a8253a74da3'Michael Niedermayer2014-12-02
|\| | | | | | | | | | | | | | | | | | | * commit '604c9b1196c70d79bbbc1f23e75f6a8253a74da3': rtsp: move the CONFIG_ macros to the beginning of the check Conflicts: libavformat/rtsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtsp: move the CONFIG_ macros to the beginning of the checkVittorio Giovara2014-12-02
| | | | | | | | | | With --disable-optimizations, the DCE of some compilers does not remove such unused code, causing linking failure.
* | avformat/apngdec: exit probing when skipping is not possible.Benoit Fouet2014-12-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | apng: move shared header from avformat to avcodec.Benoit Fouet2014-12-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/qcp: Print unknown GUID on error.Carl Eugen Hoyos2014-12-02
| |
* | Also print GUIDs as shown in the Windows registry to ease debugging.Carl Eugen Hoyos2014-12-02
| |
* | avformat/crypto: Use av_memdup()Michael Niedermayer2014-12-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/crypto: added encryptionChristian Suloway2014-12-02
| | | | | | | | | | Signed-off-by: Christian Suloway <csuloway@globaleagleent.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: Search harder for missing stream information in flv by defaultMichael Niedermayer2014-12-01
| | | | | | | | | | | | Fixes Ticket4133 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc: fix spelling errorsAndreas Cadhalpun2014-12-01
| | | | | | | | | | | | succesfully => successfully, reproducable => reproducible, specifiying => specifying, isnt => isn't, seperated => separated Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mxfdec: Reset structural_components_count when allocation failsMichael Niedermayer2014-11-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavformat/mxfdec.c: initial support for EssenceGroupsMark Reid2014-11-30
| | | | | | | | | | Previous version reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/riffdec: ask for samples with wav header size < 14Michael Niedermayer2014-11-30
| | | | | | | | | | | | Based on commit by Hendrik Leppkes <h.leppkes@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '491805636cef50d3f582bd345e1460eeb739ea48'Michael Niedermayer2014-11-28
|\| | | | | | | | | | | | | * commit '491805636cef50d3f582bd345e1460eeb739ea48': rtmpproto: Fix a typo in a comment Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpproto: Fix a typo in a commentMartin Storsjö2014-11-28
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'fcae9f212a6001d966c52dc22cd4b22e9851b428'Michael Niedermayer2014-11-28
|\| | | | | | | | | | | | | * commit 'fcae9f212a6001d966c52dc22cd4b22e9851b428': dashenc: Avoid a VLA-like construct Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dashenc: Avoid a VLA-like constructMartin Storsjö2014-11-28
| | | | | | | | | | | | | | This fixes the build on compilers that interpreted the earlier code as a variable length array (which we intentionally disallow). Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'a9d8d35e4833fc4dfbf557ce73c84e9ca6224427'Michael Niedermayer2014-11-28
|\| | | | | | | | | | | | | | | | | | | * commit 'a9d8d35e4833fc4dfbf557ce73c84e9ca6224427': dashenc: Add options to make segment names configurable Conflicts: libavformat/dashenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dashenc: Add options to make segment names configurableBryan Huh2014-11-28
| | | | | | | | | | | | | | This allows one to specify templated segment names for init-segments, media-segments, and for the base-url in the case of single-file. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '01eac895ab350027467ffbe7278740f89ae8be75'Michael Niedermayer2014-11-28
|\| | | | | | | | | | | | | | | | | | | | | * commit '01eac895ab350027467ffbe7278740f89ae8be75': rtmpproto: Only prepend @setDataFrame for onMetaData and |RtmpSampleAccess Conflicts: libavformat/rtmpproto.c See: 60fd790f381cd404ffdafa8a86a6dc93c9d80f99 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpproto: Only prepend @setDataFrame for onMetaData and |RtmpSampleAccessMartin Storsjö2014-11-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, when streaming to an RTMP server, any time 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. Since data is fed to the rtmp_write function in smaller pieces (depending on the calling IO buffer size), we can't generally assume that the whole packet (or even the whole command string) is available at once, therefore we can only check the command string once the full packet has been transferred to us for sending. Based on a patch by Jeffrey Wescott. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '44127b157e9f8acb837d4bb3a094f56b40da3ef5'Michael Niedermayer2014-11-28
|\| | | | | | | | | | | | | * commit '44127b157e9f8acb837d4bb3a094f56b40da3ef5': rtmppkt: Make pkt->data reallocable Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmppkt: Make pkt->data reallocableMartin Storsjö2014-11-28
| | | | | | | | | | | | | | | | We try to avoid mixing av_malloc with av_realloc, since av_malloc may be implemented with functions that can't (formally) be mixed with the functions used in av_realloc. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '3c3b8003a13d9c3668c0bb6d79d2376da3b2b352'Michael Niedermayer2014-11-28
|\| | | | | | | | | | | | | | | | | | | * commit '3c3b8003a13d9c3668c0bb6d79d2376da3b2b352': rtmpproto: Simplify code for copying data into the output packet Conflicts: libavformat/rtmpproto.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpproto: Simplify code for copying data into the output packetMartin Storsjö2014-11-28
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '857e6667f9061ae261c0b951113e4efc4329b05e'Michael Niedermayer2014-11-28
|\| | | | | | | | | | | | | | | | | | | * commit '857e6667f9061ae261c0b951113e4efc4329b05e': rtmpproto: Clarify a comment Conflicts: libavformat/rtmpproto.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpproto: Clarify a commentMartin Storsjö2014-11-28
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | lavf/ffmenc: store recommended encoder configurationLukasz Marek2014-11-27
| | | | | | | | | | | | | | | | | | | | | | ffmenc will store recommended encoder configuration if present. This will allow the user to base on local defaults and apply only explicitly set options. If recommended encoder configuration is not present, then non-default context's options are stored. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-21 03:01:56 +0000