- 05 Oct, 2013 4 commits
-
-
Michael Niedermayer authored
* qatar/master: ismindex: Change the duration field to int64_t Merged-by:
Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
* commit '583a287f': ismindex: Calculate the file duration among the included tracks Merged-by:
Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
* commit 'd347a7b2': ismindex: Use the individual stream duration instead of the global one Merged-by:
Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
* commit 'b698542a': mov: Don't allocate arrays with av_malloc that will be realloced Merged-by:
Michael Niedermayer <michaelni@gmx.at>
-
- 04 Oct, 2013 36 commits
-
-
Michael Niedermayer authored
Signed-off-by:
Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
Signed-off-by:
Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
Signed-off-by:
Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
Signed-off-by:
Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
Fixes Ticket3021 Signed-off-by:
Michael Niedermayer <michaelni@gmx.at>
-
Lukasz Marek authored
Signed-off-by:
Lukasz Marek <lukasz.m.luki@gmail.com> Signed-off-by:
Michael Niedermayer <michaelni@gmx.at>
-
Martin Storsjö authored
This reduces the risk for overflow in pathlogical cases. Signed-off-by:
Martin Storsjö <martin@martin.st>
-
Martin Storsjö authored
If the input file contains other tracks (non video/audio) that aren't included in ismindex, the global file duration as returned by libavformat might not be equal to the maximum of the duration of the actual included tracks. Signed-off-by:
Martin Storsjö <martin@martin.st>
-
Martin Storsjö authored
The stream duration is used for calculating the duration of the last fragment easily without manually parsing anything else than the mfra/tfra atoms. When the global file duration was used previously, the duration of the last fragment could end up wrong if the streams weren't equally long. Signed-off-by:
Martin Storsjö <martin@martin.st>
-
Martin Storsjö authored
CC: libav-stable@libav.org Signed-off-by:
Martin Storsjö <martin@martin.st>
-
Paul B Mahol authored
Signed-off-by:
Paul B Mahol <onemda@gmail.com>
-
Michael Niedermayer authored
Fixes Ticket2991 Signed-off-by:
Michael Niedermayer <michaelni@gmx.at>
-
Stefano Sabatini authored
Success code must be >= 0 and not == 0, consistently with the implementation.
-
Stefano Sabatini authored
Should prevent wrong uses, or at least decrease their chance.
-
Michael Niedermayer authored
* qatar/master: x86: fdct: Only build fdct code if encoders have been enabled Merged-by:
Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
* commit 'cd818b3a': rtmpproto: Validate the embedded flv packet size before copying Merged-by:
Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
* commit '8921e32f': rtmpproto: Readjust the end of the flv buffer if handle_metadata exited early Merged-by:
Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
* commit '24fee953': rtmpproto: Move the flv header/trailer addition to append_flv_data Merged-by:
Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
* commit '72540e51': rtmpproto: Clear the flv allocation size on reallocp failures Merged-by:
Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
* commit '4d6d7029': rtmpproto: Pass the 'live' parameter in the right unit Merged-by:
Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
* commit 'a6b36132': rtmpproto: Print the error code string if there's no description Merged-by:
Michael Niedermayer <michaelni@gmx.at>
-
Clément Bœsch authored
See b2bed932.
-
Michael Niedermayer authored
* commit 'b2bed932': cosmetics: Group .name and .long_name together in codec/format declarations Conflicts: libavcodec/8svx.c libavcodec/alac.c libavcodec/cljr.c libavcodec/dnxhddec.c libavcodec/dnxhdenc.c libavcodec/dpxenc.c libavcodec/dvdec.c libavcodec/dvdsubdec.c libavcodec/dvdsubenc.c libavcodec/ffv1dec.c libavcodec/flacdec.c libavcodec/flvdec.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/g726.c libavcodec/gif.c libavcodec/gifdec.c libavcodec/h261dec.c libavcodec/h263dec.c libavcodec/iff.c libavcodec/imc.c libavcodec/libopencore-amr.c libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libspeexenc.c libavcodec/libvo-amrwbenc.c libavcodec/libvorbisenc.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/libxavs.c libavcodec/libxvid.c libavcodec/ljpegenc.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mpeg12dec.c libavcodec/mpeg4videodec.c libavcodec/msmpeg4dec.c libavcodec/pgssubdec.c libavcodec/pngdec.c libavcodec/pngenc.c libavcodec/proresdec_lgpl.c libavcodec/proresenc_kostya.c libavcodec/ra144enc.c libavcodec/rawdec.c libavcodec/rv10.c libavcodec/sp5xdec.c libavcodec/takdec.c libavcodec/tta.c libavcodec/v210dec.c libavcodec/vp6.c libavcodec/wavpack.c libavcodec/xbmenc.c libavcodec/yop.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
* commit '49fe9c05': oggparsevorbis: K&R formatting cosmetics Conflicts: libavformat/oggparsevorbis.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
* commit '47b6cfc2': avformat/output-example: Declare link dependency on libswscale in the Makefile Conflicts: libavformat/Makefile Changes to libavformat/Makefile are not merged as our build system for the examples is different. Merged-by:
Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
* commit '80fefbed': x86: cpu: Restore some explanatory comments removed in 7160bb71Merged-by:
Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
* commit '6a5bfd4d': atrac: Add missing av_cold See: 85224156Merged-by:
Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
Signed-off-by:
Michael Niedermayer <michaelni@gmx.at>
-
Clément Bœsch authored
This restore the latest packet which was dropped from the FATE test in dbfe6110.
-
Diego Biurrun authored
fdct is only initialized if encoders are enabled.
-
Martin Storsjö authored
This wasn't an issue prior to 58404738, when the whole RTMP packet was copied at once and the length of the individual embedded flv packets only were validated by the flv demuxer. Prior to this patch, this could lead to reads and writes out of bound. Signed-off-by:
Martin Storsjö <martin@martin.st>
-
Martin Storsjö authored
If the embedded flv packets were incomplete and we aborted the copying loop early, make sure the flv buffer is trimmed to only contain full packets. Signed-off-by:
Martin Storsjö <martin@martin.st>
-
Martin Storsjö authored
update_offset is also called from handle_metadata, where the packet header sizes is already included in the size. Previously this lead to flv_data/flv_size including 15 uninitialized bytes at the end after each call to handle_metadata, making the flv demuxer lose sync with the stream. Also remove leftover copying in handle_metadata. This is a leftover from the refactoring in 58404738. (Previously this final mempcy was the one that copied all the packets at once, while this is done within the loop right now.) After making sure flv_size is set to the right size, this write was out of bounds. Signed-off-by:
Martin Storsjö <martin@martin.st>
-
Martin Storsjö authored
This was overlooked in d872fb0f since I assumed all the realloc issues in the rtmp code was fixed already. Signed-off-by:
Martin Storsjö <martin@martin.st>
-
Martin Storsjö authored
The current magic numbers passed are values in seconds, while the parameter itself should be passed over the wire in milliseconds. This makes (some/all?) live streams from Red5 work correctly, that previously returned StreamNotFound even with "-rtmp_live live". After this commit, the default 'any' also works on these streams. Signed-off-by:
Martin Storsjö <martin@martin.st>
-
Martin Storsjö authored
On (certain streams/setups at least on) Red5, the description string actually is present, but empty. Therefore, first try loading the description, but if not found or empty, load the code string instead. The code string is quite understandable in most cases anyway (like "NetStream.Play.StreamNotFound"). Signed-off-by:
Martin Storsjö <martin@martin.st>
-