summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
...
* asfenc: add ASF_Reserved_4 as defined in section 10.10 of the ASF specVladimir Pantelic2013-09-19
| | | | | Signed-off-by: Vladimir Pantelic <vladoman@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* asfdec: replace magic constant with DATA_HEADER_SIZEVladimir Pantelic2013-09-19
| | | | | Signed-off-by: Vladimir Pantelic <vladoman@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* asfdec: substract preroll time from marker presentation timeVladimir Pantelic2013-09-19
| | | | | | | this was forgotten when we changed ASF to not output the preroll time Signed-off-by: Vladimir Pantelic <vladoman@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* idroqdec: Make sure a video stream has been allocated before returning packetsMartin Storsjö2013-09-19
| | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* rtmp: Unbreak handle_notifyLuca Barbato2013-09-19
| | | | Commit 5626f994f273af80fb100d4743b963304de9e05c broke it.
* Add a WebP decoderJustin Ruggles2013-09-18
| | | | | Container and lossy decoding by Aneesh Dogra <aneesh@sugarlabs.org> Lossless decoding by Justin Ruggles <justin.ruggles@gmail.com>
* avformat: Use av_reallocp() where suitableAlexandra Khirnova2013-09-18
| | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* rmdec: Validate the fps valueMartin Storsjö2013-09-18
| | | | | | | | Abort if it is invalid if strict error checking has been requested. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* movenc: Add an option for omitting the tfhd base offsetMartin Storsjö2013-09-17
| | | | | | | | | | This makes the output fragments independent of their position in the output stream, making the output work better when streamed. QuickTime Player doesn't support fragmented mp4 without the base data offset, though. Signed-off-by: Martin Storsjö <martin@martin.st>
* movenc: Write the moof atom in two passesMartin Storsjö2013-09-17
| | | | | | | | | | | This is a bit more work, but avoids having to fill in the data offset field afterwards instead of directly when the rest of the trun atom is written. This simplifies future cases where this field needs to be set to something different. Signed-off-by: Martin Storsjö <martin@martin.st>
* rtmp: Support reading interleaved chunks.Josh Allmann2013-09-17
| | | | | | | | | | | | | | | A given packet won't always come in contiguously; sometimes they may be broken up on chunk boundaries by packets of another channel. This support primarily involves tracking information about the data that's been read, so the reader can pick up where it left off for a given channel. As a side effect, we no longer over-report the bytes read if (toread = MIN(size, chunk_size)) == size Signed-off-by: Martin Storsjö <martin@martin.st>
* xmv: Add more sanity checks for parameters read from the bitstreamMartin Storsjö2013-09-17
| | | | | | | | | | | Since the number of channels is multiplied by 36 and assigned to to a uint16_t, make sure this calculation didn't overflow. (In certain cases the calculation could overflow leaving the truncated block_align at 0, leading to divisions by zero later.) Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* rtmpproto: Extend a comment to explain the prev_pkt arrays rolesMartin Storsjö2013-09-17
| | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* rtmpproto: Consistently use the right prev_pkt arrayMartin Storsjö2013-09-17
| | | | | | | prev_pkt[0] is used for input packets, while prev_pkt[1] is used for output. Signed-off-by: Martin Storsjö <martin@martin.st>
* rtmpproto: Check for the right return codeMartin Storsjö2013-09-17
| | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* mov: Don't use a negative duration for setting other fieldsMartin Storsjö2013-09-17
| | | | | | | | | | Some files have the duration set to -1 in the mdhd atom, more or less legitimately. (We produce such files ourselves, for the initial duration in fragmented mp4 files.) Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* oggparseogm: Convert to use bytestream2Martin Storsjö2013-09-17
| | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* matroskadec: Verify realaudio codec parametersMartin Storsjö2013-09-17
| | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* rtmp: rename main_channel_id to stream_id.Josh Allmann2013-09-17
| | | | | | | This more closely corresponds to the usage of the field. Its usage here is unrelated to the channel ID. Signed-off-by: Martin Storsjö <martin@martin.st>
* rtmp: Follow Flash player numbering for channels.Josh Allmann2013-09-17
| | | | | | | | | | | Channel 4 is typically used by the Flash player to transmit audio, channel 6 for video, and various stream-specific invokes get sent over channel 8, which is designated the source channel. This more closely matches the behavior of the Flash player, including the transmission of play requests over channel 8. Signed-off-by: Martin Storsjö <martin@martin.st>
* rtmp: Send video on a separate channel.Josh Allmann2013-09-17
| | | | | | | | | | | Sending non-monotonic packets (e.g. when the audio and video streams are monotonic within themselves but not muxed monotonically) will lead to negative values the RTMP timestamp field (where timestamps are transmitted only as deltas for each channel), and this delta can end up being incorrectly written as a large unsigned number. Signed-off-by: Martin Storsjö <martin@martin.st>
* lavf: Make probe_codec return an error codeAlexandra Khirnova2013-09-16
| | | | | | This allows handling errors from av_realloc properly. Signed-off-by: Martin Storsjö <martin@martin.st>
* 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: Add a flag to enable/disable per-packet flushingLuca Barbato2013-09-16
| | | | | | | | | This is enabled by default and can be disabled with "-fflags -flush_packets". Inspired by a patch from Nicolas George <nicolas.george@normalesup.org>. Signed-off-by: Martin Storsjö <martin@martin.st>
* flv: Do not export datastream as metadataLuca Barbato2013-09-16
| | | | It is used internally.
* rtmp: Store all the notify messagesLuca Barbato2013-09-16
| | | | The onTextData is used to implement text data streams in flv.
* rtmp: Do not send the first field twice within the handshakeLuca Barbato2013-09-16
|
* rtmp: Drop an unneeded warningLuca Barbato2013-09-16
| | | | | Apparently a widely used streaming server requires that the second field always presents a version during C1 phase.
* rtmp: Support play method in listen modeLuca Barbato2013-09-16
|
* rtmp: Factor out publish specific codeLuca Barbato2013-09-16
| | | | Will be reused for supporting play.
* vocdec: Don't update codec parameters mid-streamMartin Storsjö2013-09-16
| | | | | | | | | | | | | | | | | | If we really want to support parameter changes, they need to be signalled along with the AVPackets as parameter change side data, not just changing the AVCodecContext parameters when a packet is demuxed (since there may be other earlier packets yet undecoded). Something similar was already done for the sample rate in 0883109b2, but some parameters were left changeable. This avoids having to recheck the channel count for validity for each decoded frame in (ad)pcm decoders, unless the decoders explicitly say that they accept parameter changes. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* sierravmd: Do sanity checking of frame sizesMartin Storsjö2013-09-16
| | | | | | | | | | | Limit the size to INT_MAX/2 (for simplicity) to be sure that size + BYTES_PER_FRAME_RECORD won't overflow. Also factorize other existing error return paths. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* omadec: Properly check lengths before incrementing the positionMartin Storsjö2013-09-16
| | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* matroskaenc: Fix stray pointers left over from av_reallocp_array refactoringAlexandra Khirnova2013-09-12
| | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* mp3: add .mpa extensionVittorio Giovara2013-09-12
| | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* mpc8: Make sure the first stream exists before parsing the seek tableMartin Storsjö2013-09-12
| | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* mpc8: Check the seek table size parsed from the bitstreamMartin Storsjö2013-09-12
| | | | | | | | | Limit the size to INT_MAX/2 (for simplicity) to be sure that size + FF_INPUT_BUFFER_PADDING_SIZE won't overflow. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* ape: Don't allow the seektable to be omittedMartin Storsjö2013-09-12
| | | | | | | | | The seektable is required for filling in ape->frames[i].pos further down. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* smacker: Avoid integer overflow when allocating packetsMartin Storsjö2013-09-11
| | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* smacker: Don't return packets in unallocated streamsMartin Storsjö2013-09-11
| | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* dsicin: Add some basic sanity checks for fields read from the fileMartin Storsjö2013-09-11
| | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* avformat: Use av_reallocp_array() where suitableAlexandra Khirnova2013-09-10
| | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* movenc: Simplify setting the fragmentation flagMartin Storsjö2013-09-09
| | | | | | | This makes sure the faststart vs fragmentation check works as intended when fragmentation is enabled due to using the ismv mode. Signed-off-by: Martin Storsjö <martin@martin.st>
* movenc: Add a warning message if conflicting options have been specifiedMartin Storsjö2013-09-09
| | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* tcp: Explicitly convert a pointer to a boolean integerMartin Storsjö2013-09-09
| | | | | | | | | This fixes warnings about making integers from pointers without a cast, and avoids the theoretical case where the lower 32 bits of the pointer would all be zero where the implicit cast wouldn't give the right result. Signed-off-by: Martin Storsjö <martin@martin.st>
* lavf: fix the comparison in an overflow checkAnton Khirnov2013-09-07
| | | | | | CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* dv: Add a guard to not overread the ppcm arrayLuca Barbato2013-09-07
| | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* avisynth: K&R formatting cosmeticsDiego Biurrun2013-09-06
|
* avisynth: Add missing #include for NULL_IF_CONFIG_SMALLDiego Biurrun2013-09-06
|
* matroskaenc: Allow chapters to be written in trailerJohn Stebbins2013-09-04
| | | | | | | | This allows creation of frame accurate chapter marks from sources like DVD and BD where the precise chapter location is not known until the chapter mark has been reached during reading. Signed-off-by: Anton Khirnov <anton@khirnov.net>