virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
33,892 Commits 37 Branches 400 Tags 460 MiB
fe07c9c6b5
Commit Graph

8508 Commits

Author SHA1 Message Date
Alex Converse
f0ff9eb493 avformat: Probe codecs at score 0 on buffer exhaustion conditions. 2012-06-05 09:51:51 -07:00
Alex Converse
62bebf6edb avformat: Factorize codec probing. 2012-06-05 09:51:51 -07:00
Kostya Shishkov
c6061443f7 Indeo Audio decoder 2012-06-05 18:30:54 +02:00
Alex Converse
41e9682af2 movenc: Write chan atom for all audio tracks in mov mode movies. 2012-06-04 10:08:31 -07:00
Jindřich Makovička
84e430dd7b mpegtsenc: use avio_open_dyn_buf(), zero pointers after freeing 
Per suggestion by Michael Niedermayer.

Signed-off-by: Jindřich Makovička <makovick@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-06-04 15:41:09 +03:00
Anton Khirnov
a982e5a031 avidec: make scale and rate unsigned. 
The specs say they are unsigned 32bit integers.
 2012-06-04 14:18:49 +02:00
Anton Khirnov
19dfbf1915 librtmp: return AVERROR_UNKNOWN instead of -1. 2012-06-03 15:46:27 +02:00
Anton Khirnov
a91943bcef librtmp: don't abuse a variable for two unrelated things. 2012-06-03 15:46:16 +02:00
Anton Khirnov
007aedeebf librtmp: add rtmp_app and rtmp_playpath private options. 
This makes it easier to switch between native rtmp and librtmp.
 2012-06-03 15:45:55 +02:00
Luca Barbato
21e2dc9fb7 flv: support stream text data as onTextData 
Adobe specifies onTextData as the standard message to use to deliver
text information.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2012-06-03 03:36:01 +02:00
Jindrich Makovicka
2439bd8681 mpegtsenc: Support LATM packetization for AAC 
This adds the avoption mpegts_flags and converts the existing
resend_headers option into a flag, keeping the old option as
fallback for now.

Signed-off-by: Jindrich Makovicka <makovick@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-06-03 01:20:41 +03:00
Jindrich Makovicka
485d3ea064 adtsenc: Don't expose the muxer internals to the rest of lavf 
This isn't required any longer, when the mpegts muxer uses it
as a proper chained muxer.

Signed-off-by: Jindrich Makovicka <makovick@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-06-03 01:18:11 +03:00
Jindrich Makovicka
b1c56eabe8 mpegtsenc: use AVFormatContext for AAC packetization 
This removes the dependency on adts.c internals, and simplifies
adding other packetization formats.

Signed-off-by: Jindrich Makovicka <makovick@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-06-03 01:17:48 +03:00
Jindrich Makovicka
d1a3a3d4b2 mpegtsenc: use AVERROR() for return codes 
Signed-off-by: Jindrich Makovicka <makovick@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-06-03 01:13:35 +03:00
Martin Storsjö
dbaf79c9d7 http: Add the url_shutdown function for https, too 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-06-01 18:38:31 +03:00
Martin Storsjö
5952564185 http: Simplify code by removing a local variable 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-06-01 18:38:29 +03:00
Martin Storsjö
3cbcfa2dec http: Clear the old URLContext pointer when closed 
This fixes issues with opening http urls that have authentication
or redirects, introduced in commit e999b641.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-06-01 18:38:28 +03:00
Martin Storsjö
b7c3772be8 tcp: Try enabling SO_REUSEADDR when listening 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-06-01 01:56:22 +03:00
Martin Storsjö
641f4a885f tcp: Check the return values from bind and accept 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-06-01 01:56:21 +03:00
Oka Motofumi
5c742005fb avisynth: Make sure the filename passed to avisynth is in the right code page 
avisynth is a non-unicode application and cannot accept UTF-8
characters. Therefore, the input filename should be converted to
the correct code page that it expects.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-31 22:39:08 +03:00
Samuel Pitoiset
9613240f72 http: Pass the proper return code of net IO operations 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-30 23:46:51 +03:00
Samuel Pitoiset
1876e7c0c2 http: Add 'post_data', a new option which sets custom HTTP post data 
This allows doing http posts with a content-length header sent
in advance, avoiding chunked encoding.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-30 23:41:05 +03:00
Ronald S. Bultje
64bde80563 mp3/ac3 probe: search for PES headers to prevent probing MPEG-PS as MP3. 2012-05-30 09:08:29 -07:00
Samuel Pitoiset
e999b641df http: Add support for reusing the http socket for subsequent requests 
Introduce ff_http_do_new_request(), a new function which sends a new
HTTP request, reusing the existing connection to the server.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-28 16:42:40 +03:00
Samuel Pitoiset
3bdb438e65 http: Add support for using persistent connections 
Add a new AVOption 'multiple_requests', which indicates if we want
to use persistent connections (ie. Connection: keep-alive).

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-28 16:42:14 +03:00
Martin Storsjö
6099543ad4 rtsp: Check for dynamic payload handlers if no static payload mapping was found 
Some systems abuse the static payload types 35 or 36 (which
according to IANA are unassigned) for H264.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-26 21:58:18 +03:00
Martin Storsjö
68c813081b rtpenc_chain: Return an error code instead of just a plain pointer 
Also check the return value in sapenc.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-26 13:35:44 +03:00
Martin Storsjö
93cef6f923 rtpenc_chain: Free the URLContext on failure 
If an URLContext is passed in, its ownership is given to this
function, and is either owned by the returned AVFormatContext
on a successful return, or freed on failure.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-26 13:35:44 +03:00
Martin Storsjö
2dcb21a95d rtpenc: Expose the ssrc as an avoption 
This allows the caller to set it, and allows the caller to query
what it was set to.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-26 13:35:39 +03:00
Martin Storsjö
39e29aa019 cosmetics: Fix indentation 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-26 00:34:20 +03:00
Luca Barbato
c6eeb9b7b6 rtmp: fix url parsing 
The application component can have a subcomponent to specify the
application instance even if it doesn't have a ":" in the playpath.
 2012-05-25 14:20:34 -07:00
Alex Converse
ed7bdd8647 movenc: Don't write the 'wave' atom or its child 'enda' for lpcm audio. 
It's left over from stsd v0. QuickTime 7 no longer writes 'wave' or 'enda'
when 'lpcm' is the audio tag.
 2012-05-25 11:24:43 -07:00
Samuel Pitoiset
177bcc9593 rtmp: Pass the proper return code in rtmp_handshake 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-24 22:16:46 +03:00
Samuel Pitoiset
bba287fdac rtmp: Check return codes of net IO operations 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-24 22:16:46 +03:00
Samuel Pitoiset
a4d3f3580b rtmp: Return a proper error code instead of -1 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-24 00:25:36 +03:00
Samuel Pitoiset
08e93f5b46 rtmp: Check malloc calls 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-24 00:25:35 +03:00
Samuel Pitoiset
f645f1d6ea rtmp: Check ff_rtmp_packet_create calls 
Check malloc calls used by ff_rtmp_packet_create, unify error
handling and pass on error codes.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-24 00:25:35 +03:00
Martin Storsjö
1e8561e369 flvdec: Make sure sample_rate is set to the updated value 
The sample_rate variable is used for checks for audio format
changes at the end of the function.

This fixes cases where the sample rate was set from the codec
id by flv_set_audio_codec (as for nellymoser 8 kHz/16 kHz),
so the value set to last_sample_rate wasn't equal to sample_rate
at this point. This caused the demuxer otherwise reports a spurious
change to 5512 Hz and back to the correct one.

Updating channels in the same way is only done for consistency.
Currently, flv_set_audio_codec doesn't update that value.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-23 22:23:43 +03:00
Dave Yeo
3f9d6e4239 os_support: Define SHUT_RD, SHUT_WR and SHUT_RDWR on OS/2 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-23 10:38:14 +03:00
Samuel Pitoiset
e5773d8bc3 http: Add support for reading http POST reply headers 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-22 23:16:46 +03:00
Samuel Pitoiset
ba354a8cc0 http: Add http_shutdown() for ending writing of posts 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-22 23:16:44 +03:00
Samuel Pitoiset
4a9ca93556 tcp: Allow signalling end of reading/writing 
tcp_shutdown() isn't needed at the moment, but is added for
consistency to explain how the function is supposed to be used.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-22 23:16:42 +03:00
Samuel Pitoiset
32d545e0a4 avio: Add a function for signalling end of reading/writing 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-22 23:16:41 +03:00
Diego Biurrun
db9e00f469 Remove libnut wrapper 
libnut is unmaintained and known to be buggy; native NUT code exists.
 2012-05-21 08:51:50 +02:00
James Zern
e9cef89702 avformat: Add a flag to mark muxers that allow (non strict) monotone timestamps. 
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-05-20 19:50:32 -04:00
Samuel Pitoiset
5d603f1b65 http: Factorize the code by adding http_read_header() 
This function is used for reading http reply headers.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-20 20:20:50 +03:00
Mans Rullgard
68aef0b481 lavf: change some (de)muxer names to lowercase 
This is consistent with other format names.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-05-19 19:44:16 +01:00
Mans Rullgard
81ad97eeda lavf: make output format matching case insensitive 
This is consistent with how input formats are matched.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-05-19 19:44:15 +01:00
Anton Khirnov
755cd4197d mov: enable parsing for VC-1. 
This makes lavf discard broken timestamps for non-B frames in
samples/isom/vc1-wmapro.ism.
 2012-05-18 19:38:21 +02:00
Martin Storsjö
4b7304e80d rtmp: Don't assume path points to a string of nonzero length 
If using the new -rtmp_app and -rtmp_playpath parameters,
one can in many cases set the main url to just rtmp://server/.
If the trailing slash is omitted, path is a string of zero length,
and using path+1 will end up reading uninitialized data.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-17 21:16:52 +03:00
Mans Rullgard
db465be45d lavf: add mdec to is_intra_only() list 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-05-15 15:49:56 +01:00
Mans Rullgard
7c6d240665 mtv: do not byteswap raw video in demuxer 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-05-14 20:26:39 +01:00
Diego Biurrun
70be4dddc8 gxfenc: remove disabled half-implemented MJPEG tag 2012-05-14 15:38:42 +02:00
Samuel Pitoiset
d55961fa82 rtmp: Implement check bandwidth notification. 
According to the behaviour of librtmp, it is recommended to send this
message to the server after receiving the 'onBWDone' callback in order
to do bandwidth checking and improve compatibility with some servers.
 2012-05-10 13:55:32 +03:00
Samuel Pitoiset
05945db9ce rtmp: Support 'rtmp_swfurl', an option which specifies the URL of the SWF player. 2012-05-10 13:55:31 +03:00
Samuel Pitoiset
e64673e4f4 rtmp: Support 'rtmp_flashver', an option which overrides the version of the Flash plugin. 2012-05-10 13:55:30 +03:00
Samuel Pitoiset
55c9320e06 rtmp: Support 'rtmp_tcurl', an option which overrides the URL of the target stream. 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-10 13:55:26 +03:00
Sean McGovern
ded69c5e21 sctp: be consistent with socket option level 
Replace SOL_SCTP by the more portable IPPROTO_SCTP.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-05-10 00:01:45 +02:00
Diego Biurrun
59cbc4eee2 mov: make one comment slightly more specific 2012-05-09 23:12:37 +02:00
Luca Barbato
5699884c2e sctp: Initial tcp-alike sctp support with streams 
Signed-off-by: Jordi Ortiz <nenjordi@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2012-05-08 16:06:49 -07:00
Alex Converse
40f81769ae options_table: Add some missing #includes to fix "make checkheaders". 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-05-08 20:05:20 +02:00
Jordi Ortiz
fcd0298c05 rtsp: Add content-type message header parsing 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2012-05-08 10:18:35 -07:00
Samuel Pitoiset
b2e495afa8 rtmp: Support 'rtmp_live', an option which specifies if the media is a live stream. 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-08 13:21:35 +03:00
Diego Biurrun
520c1ec699 dv: Split profile handling code into a separate file. 2012-05-07 23:59:49 +02:00
Anton Khirnov
0a3ad7ff80 flvenc: use AVFormatContext, not AVCodecContext for logging. 
Encoder tag being used for muxer messages is confusing.
 2012-05-07 21:28:40 +02:00
Diego Biurrun
455245ca8a mov: Remove write-only variable in mov_read_chan(). 
libavformat/mov.c:597:25: warning: variable ‘cflags’ set but not used
 2012-05-07 20:31:23 +02:00
Anton Khirnov
1432c1c429 lavf: add missing '*' in a doxy. 2012-05-07 14:22:42 +02:00
Diego Biurrun
9eb83a56aa build: cosmetics: Split HEADERS/OBJS/PROGS lists into one entry per line. 2012-05-07 14:01:32 +02:00
Diego Biurrun
30b1961c66 Mark a number of variables only used in av_dlog() calls as av_unused. 
This fixes a number of unused-but-set gcc warnings.
 2012-05-06 18:01:31 +02:00
Janne Grunau
29d27b5425 mpegmux: add stuffing to avoid incomplete PCM frames 
Fixes https://bugzilla.libav.org/show_bug.cgi?id=244
 2012-05-06 13:18:38 +02:00
Mans Rullgard
ddce7dabd2 rtsp: avoid const warnings from strtol() call 
The strtol() interface makes it difficult to use with
const-qualified pointers.  With this change, although
the const is still lost, the compiler does not warn
about it.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-05-06 12:04:25 +01:00
Martin Storsjö
2ed503af9f rtpdec_h264: Add missing newlines to av_log calls 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-05 22:11:49 +03:00
Martin Storsjö
b97d21e4d6 rtpdec_h264: Free old extradata before clearing the pointer 
This avoids memory leaks if there actually was some extradata
set before.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-05 22:11:45 +03:00
Martin Storsjö
3c148703f6 rtpdec_h264: Reorder code blocks 
This removes one level of indentation.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-05 20:41:37 +03:00
Martin Storsjö
b368861747 rtpdec_h264: Make start_sequence a static const array 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-05 20:35:33 +03:00
Martin Storsjö
48666c2bd6 rtpdec_h264: Cleanup debug packet type counting 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-05 20:35:05 +03:00
Martin Storsjö
0b3ac9fe05 rtpdec_h264: Cosmetic cleanup 
Add/fix spacing, split long lines, align assignments where suitable.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-05 20:33:00 +03:00
Martin Storsjö
f3d471f45f rtpdec_h264: Clean up comments 
Split long comments, move long comments at the end of lines to
separate lines above, fix vertical alignment, fix up comment style
(unify trailing dots - comments had a mix of 2, 3 or 4 dots, where
it would be just as good without them at all).

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-05 20:32:29 +03:00
Martin Storsjö
dee48d095d rtpdec_h264: Convert commented out code into setting an unused variable 
It is worth keeping instead of removing, in case reading this
bit becomes necessary at some later point.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-05 20:32:09 +03:00
Martin Storsjö
44f99fe0f5 rtpdec_h264: Remove a useless ifdef 
assert is a no-op if DEBUG isn't defined.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-05 03:10:25 +03:00
Martin Storsjö
8d43b8b8e8 rtpdec_h264: Remove outdated/useless/incorrect comments 
RTCP is handled elsewhere, not in the depacketizer for an
individual format.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-05 03:10:15 +03:00
Martin Storsjö
5a571d3241 rtpdec_h264: Remove useless memory corruption checks 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-05 03:09:53 +03:00
Martin Storsjö
b7b7354c33 rtpdec_h264: Return proper error codes 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-05 03:09:44 +03:00
Martin Storsjö
5245adb963 rtpdec_h264: Check the available data length before reading 
This makes sure the length is checked for STAP-A type packets.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-05 03:09:10 +03:00
Ivan Kovtunov
de26a4b699 rtpdec_h264: Add input size checks 
This fixes crashes if given too short data packets.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-05 03:09:07 +03:00
Ronald S. Bultje
273e6af47b ea: check chunk_size for validity. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-05-04 16:06:26 -07:00
Justin Ruggles
e5356ebf22 cosmetics: indentation 2012-05-03 16:28:08 -04:00
Justin Ruggles
8916f1fbcb avformat: only fill-in interpolated timestamps if duration is non-zero 
This avoids returning duplicate timestamps for multiple packets when the
demuxer does not provide all timestamps and packet duration is not known.
 2012-05-03 16:28:08 -04:00
Justin Ruggles
ff499157a1 avformat: remove a workaround for broken timestamps 
This modifies pts in situations other than what was intended, leading to
invalid timestamps.

Reverts commit 90bb394dcc
 2012-05-03 16:28:08 -04:00
Joakim Plate
68b9ed8391 mpegts: Some additional HDMV types and reg descriptors for mpegts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-05-03 12:13:28 -04:00
Luca Barbato
0ca4642ec5 mkv: mark corrupted packets and return them 
Do return error if memory allocation or I/O fails.
 2012-04-29 20:22:09 -07:00
Luca Barbato
721af294d9 mkv: forward EMBL block data error 
Do not return 0 on error.
 2012-04-29 20:22:09 -07:00
Luca Barbato
3b52e9da10 segment: reorder seg_write_header allocation 
As pointed by Paul B Mahol <onemda@gmail.com> the previous code could
lead to null pointer dereference.
 2012-04-27 14:03:43 -07:00
Luca Barbato
e1e146a2d1 avio: make avio_close(NULL) a no-op 
Its behaviour in line with ffurl_close(NULL).
 2012-04-27 14:03:43 -07:00
Yusuke Nakamura
546adc1fee mov: Parse EC3SpecificBox (dec3 atom). 
Skip to parse fields for additional independent substreams and its
associated dependent substreams since libavcodec's E-AC-3 decoder does not
support them yet.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-04-27 16:11:46 -04:00
Martin Storsjö
df8aa4598c mpegts: Make sure we don't return uninitialized packets 
This fixes crashes, where the demuxer could return 0 even
if the returned AVPacket isn't initialized at all. This
could happen if running into EOF or running out of probesize
with non-seekable sources.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-04-27 20:05:37 +03:00
Hendrik Leppkes
949d942eef mov: support eac3 audio 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-04-25 15:24:14 -04:00
Luca Barbato
8b97ae6484 avf: fix faulty check in has_duration 
An invalid duration is AV_NOPTS_VALUE not 0.
 2012-04-25 11:40:22 -07:00
Yusuke Nakamura
462a5b7839 isom: Support more DTS codec identifiers. 
DTS LBR identifier ('dtse') is not included since libavcodec doesn't support it yet.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-04-23 14:47:17 -04:00
Dale Curtis
7521c4bab2 matroska: Clear prev_pkt between seeks. 
The new incremental parser doesn't always clear prev_pkt,
however the packet queue is cleared when seeking. Which leads
to a use-after-free.

Verified using Valgrind.

Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-04-23 14:21:42 -04:00