generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
32,283 Commits 24 Branches 241 Tags 173 MiB
c1df37e59b
Commit Graph

8104 Commits

Author SHA1 Message Date
Alex Converse
c1df37e59b hls: Re-add legacy applehttp name to preserve interface compatibility. 2012-02-14 12:13:46 -08:00
Martin Storsjö
8c62d83fe5 hlsproto: Rename the functions and context 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-14 20:05:32 +02:00
Martin Storsjö
9cb9c6c42d hlsproto: Encourage users to try the hls demuxer instead of the proto 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-14 20:05:32 +02:00
Martin Storsjö
8bdab32f4e libavformat: Rename the applehttp protocol to hls 
Keep the old protocol name around for backwards compatibility
until the next bump.

Deprecate the method of implicitly assuming the nested protocol.
For applehttp://server/path, it might have felt logical, but
supporting hls://server/path isn't quite as intuitive. Therefore
only support hls+http://server/path from now on.

Using this protocol at all is discouraged, since the hls demuxer
is more complete and fits into the architecture better. There
have been cases where the protocol implementation worked better
than the demuxer, but this should no longer be the case.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-14 20:05:32 +02:00
Martin Storsjö
65cd7bf32f hls: Rename the functions and context 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-14 20:05:32 +02:00
Martin Storsjö
2772258a98 libavformat: Rename the applehttp demuxer to hls 
When this demuxer was created, there didn't seem to be any
consensus of a common short name for this protocol. Now
the consensus seems to be to call it hls.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-14 20:05:31 +02:00
Martin Storsjö
08bddfcde5 rtpdec: Support H263 in RFC 2190 format 
This is different from the "modern" RTP payload formats for H263
as defined by RFC 4629, 2429 and 3555. According to the newer RFCs,
this old one is to be considered deprecated and only be used for
interoperating with legacy systems.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-14 20:05:31 +02:00
Martin Storsjö
4ace130ee6 movenc: Support muxing VC1 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-14 16:12:18 +02:00
Diego Biurrun
c3b57d6e76 librtmp: Add "lib" prefix to librtmp URLProtocol declarations. 
This allows easily differentiating between both implementations within the build
system and combining the native implementation for plain RTMP with librtmp for
the RTMPE, RTMPS, RTMPT, RTMPTE protocol variants.
 2012-02-14 11:37:01 +01:00
Martin Storsjö
df6050188c movenc: Use defines instead of hardcoded numbers for RTCP types 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-14 12:23:07 +02:00
Paul B Mahol
1c77a5307f smjpegdec: implement seeking 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-02-14 10:12:44 +01:00
Matthew Szatmary
7dfe8f5557 rtpdec: Use 4 byte startcodes for H.264 
If muxing into mpegts, 4 byte startcodes for the first NAL
of an access unit is required. Thus it is simplest for the
RTP depacketizer to just use 4 byte startcodes everywhere.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-13 23:05:10 +02:00
Diego Biurrun
529506b5f6 matroskadec: Mark variable as av_unused. 
This avoids unused variable warnings when zlib/bzlib are not available.
 2012-02-13 19:20:54 +01:00
Diego Biurrun
6df5c528ca Move some conditionally used variables into the block where they are used. 
This allows dropping the av_unused argument from them.
 2012-02-13 19:20:54 +01:00
Diego Biurrun
7331b6e718 Drop some completely unnecessary av_unused attributes. 2012-02-13 19:20:53 +01:00
Martin Storsjö
5d561514b7 movenc: Support muxing wmapro in ismv/isma 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-13 19:57:28 +02:00
Martin Storsjö
ddf422803b mpegtsenc: Add an AVOption for forcing a new PAT/PMT/SDT to be written 
When segmenting the output from the mpegts muxer, one can
now set this option when cutting to a new segment, to make sure
the next segment starts with PAT/PMT/SDT.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-13 17:31:05 +02:00
Diego Biurrun
d1c4ec7f5e build: Set correct dependencies for rtmp* protocols implemented by librtmp. 2012-02-13 09:59:51 +01:00
Andrey Utkin
e3cc617263 lavf: fix aspect ratio mismatch message. 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-02-12 17:18:24 +01:00
Joakim Plate
af701d42c3 cafdec: Check return value of avio_seek and avoid modifying state if it fails 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-02-10 15:27:50 -05:00
Joakim Plate
b69c2e0e6d yop: Check return value of avio_seek and avoid modifying state if it fails 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-02-10 15:27:50 -05:00
Joakim Plate
e54165aa39 tta: Check return value of avio_seek and avoid modifying state if it fails 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-02-10 15:27:49 -05:00
Joakim Plate
066ad0926a tmv: Check return value of avio_seek and avoid modifying state if it fails 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-02-10 15:27:49 -05:00
Joakim Plate
c7b08bc0a7 r3d: Check return value of avio_seek and avoid modifying state if it fails 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-02-10 15:27:49 -05:00
Joakim Plate
8dcd00eabd nsvdec: Check return value of avio_seek and avoid modifying state if it fails 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-02-10 15:27:49 -05:00
Joakim Plate
97aa092997 mpc8: Check return value of avio_seek and avoid modifying state if it fails 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-02-10 15:27:49 -05:00
Joakim Plate
9712e82a4e jvdec: Check return value of avio_seek and avoid modifying state if it fails 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-02-10 15:27:49 -05:00
Joakim Plate
64476d7ee8 filmstripdec: Check return value of avio_seek and avoid modifying state if it fails 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-02-10 15:27:49 -05:00
Joakim Plate
d7c11b114b ffmdec: Check return value of avio_seek and avoid modifying state if it fails 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-02-10 15:27:49 -05:00
Joakim Plate
8332321c57 dv: Check return value of avio_seek and avoid modifying state if it fails 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-02-10 15:27:49 -05:00
Joakim Plate
3371e89640 bink: Check return value of avio_seek and avoid modifying state if it fails 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-02-10 15:27:49 -05:00
Martin Storsjö
ba83ac4c27 rtpenc: Write a log message if the max packet size is too small 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-10 10:48:51 +02:00
Alex Converse
8dbdc2d840 dv: Move a table used only by the demuxer out of a shared header. 2012-02-09 19:16:15 -08:00
Alex Converse
0ab3687924 dv: Fix small overread in audio frequency table. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
 2012-02-09 19:16:15 -08:00
Paul B Mahol
0f3d8baef9 WavPack demuxer: set packet duration 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-02-09 13:13:04 -05:00
Tomas Härdin
e24167aae6 mxfdec: Ignore the last entry in Avid's index table segments 
The last entry is the total size of the essence container.
Previously a TemporalOffset error would be logged, even though
segments like these are expected.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-02-09 13:26:02 +01:00
Tomas Härdin
d6b81ff949 mxfdec: Sanity-check SampleRate 
This avoids a SIGFPE if SampleRate is missing or set to naughty values.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-02-09 13:00:05 +01:00
Tomas Härdin
c65642d351 mxfdec: Handle small EditUnitByteCount 
These are common with audio atoms. Without this the demuxer would read two
bytes at a time for a mono 16-bit file.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-02-09 12:59:41 +01:00
Tomas Härdin
240ddbce56 mxfdec: Consider OPAtom files that do not have exactly one EC to be OP1a 
This fixes demuxing of 2011_DCPTEST_24FPS.V.mxf.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-02-09 12:55:44 +01:00
Tomas Härdin
9123950be0 mxfdec: Don't crash in mxf_packet_timestamps() if current_edit_unit overflows 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-02-09 12:54:14 +01:00
Tomas Härdin
d00257e96a mxfdec: Zero nb_ptses in mxf_compute_ptses_fake_index() 
This fixes SIGSEGV on files with both CBR and VBR index segments (zzuf6.mxf).

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-02-09 12:54:13 +01:00
Tomas Härdin
df2a85085e mxfdec: Sanity check PreviousPartition 
Without this certain files could get the demuxer stuck in a loop.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-02-09 12:54:05 +01:00
Tomas Härdin
11800c8c89 mxfdec: Never seek back in local sets and KLVs 
Specially crafted files can lead the parsing code to take too long.
We fix a lot of these problems by not allowing local tags to extend
past the end of the set and not allowing other KLVs to be read past
the end of themselves.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-02-09 12:46:12 +01:00
Tomas Härdin
687e2fdebd mxfdec: Move the current_partition check inside mxf_read_header() 
This fixes SIGSEGV on files where this is the case, such as zzuf4.mxf.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-02-09 12:43:47 +01:00
Tomas Härdin
e352c96c17 mxfdec: Fix infinite loop in mxf_packet_timestamps() 
This can happen if an index table segment has a very large IndexStartPosition.
zzuf3.mxf is an example of such a file.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-02-09 12:42:59 +01:00
Tomas Härdin
0373ec635d mxfdec: Check eof_reached in mxf_read_local_tags() 
This fixes an infinite loop with zzuf2.mxf.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-02-09 12:41:50 +01:00
Tomas Härdin
effe3b9575 mxfdec: Check for NULL component 
This fixes a SIGSEGV with zzuf1.mxf.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-02-09 12:41:50 +01:00
Tomas Härdin
29fc8f50cd mxfdec: Make sure mxf->nb_index_tables > 0 in mxf_packet_timestamps() 
Only the OPAtom demuxing logic is guaranteed to have index tables,
meaning OP1a files that lack an index would cause SIGSEGV.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-02-09 12:41:42 +01:00
Tomas Härdin
a3923482f2 mxfdec: Make sure x < index_table->nb_ptses 
Avoids a SIGSEGV on files with IndexEntryCount < IndexDuration.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-02-09 12:40:34 +01:00
Paul B Mahol
a16c3a07a6 apetag: fix comment 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-02-08 21:47:12 -05:00