generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
22,819 Commits 24 Branches 241 Tags 173 MiB
8cdfa4747b
Commit Graph

5670 Commits

Author SHA1 Message Date
Martin Storsjö
7c823d8b7f Rename a function which is no longer ipv6-specific. Patch by Martin Storsjö 
<$firstname () $firstname st>.

Originally committed as revision 21382 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-22 16:10:08 +00:00
Alan Steremberg
00eb13e05f Use the control URI from the SDP (if present) rather than the input filename, 
if present. This fixes playback of a number of MS-RTSP streams, mostly these
for which playback contains a session key in the URI. Fixes issue 1697.
Patch by Alan Steremberg <$firstname dot $lastname () gmail com>.

Originally committed as revision 21381 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-22 16:04:15 +00:00
Rafaël Carré
e380b9182b mkvenc: Write TrackTimecodeScale 
patch by Rafael (dot) Carre (a) gmail (d) com

Originally committed as revision 21372 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-21 20:49:27 +00:00
Ronald S. Bultje
2e13ecfeca Remove reply and content_ptr arguments from rtsp_send_cmd_async(), since 
they are unused.

Originally committed as revision 21371 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-21 20:04:17 +00:00
Ronald S. Bultje
f8c087333d Change on rtsp_send_cmd() to the _async() version since we don't use the 
response anyway.

Originally committed as revision 21370 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-21 20:01:11 +00:00
Ronald S. Bultje
7eaa646fd6 Reindent after r21368. 
Originally committed as revision 21369 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-21 19:50:40 +00:00
Ronald S. Bultje
8b9457deab Pretty embarassing bug; we shouldn't use av_strlcatf() on an uninitialized 
buffer, that is doomed to not work at some point.

Originally committed as revision 21368 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-21 19:48:30 +00:00
Martin Storsjö
073189917e Make output-example.c handle AAC audio. 
Patch by Martin Storsjö martin martin st

Originally committed as revision 21367 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-21 17:10:13 +00:00
Martin Storsjö
b4d68544c8 Remove IPv4-only codepath. Patch by Martin Storsjö <$first $first st>. 
Originally committed as revision 21365 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-21 15:42:05 +00:00
David Conrad
0fc07ad951 Set start_time and duration in AVStream instead of AVFormatContext for 
formats with only one stream; the AVFormatContext values will be derived from
the AVStream and this helps in calculating stream bitrate.

Originally committed as revision 21361 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-21 09:47:02 +00:00
Martin Storsjö
3d7b42f97b Use the configure check from r21351 and use it to properly define struct 
sockaddr (in case it's not missing) so it always works on the system that
we are defining it for, in a RFC-2553/3493-compliant way (i.e. containing
a ss_family field). which is used in udp.c. Patch by Martin Storsjö
<$firstname $firstname st>.

Originally committed as revision 21352 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-20 17:26:14 +00:00
Baptiste Coudurier
fdf4662211 fetch flv duration from file if it is set to 0 in metadata 
Originally committed as revision 21329 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-19 19:41:24 +00:00
Baptiste Coudurier
49c43fc278 reindent 
Originally committed as revision 21311 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-18 23:58:10 +00:00
Baptiste Coudurier
c3aeaa540d set average frame rate in mov demuxer 
Originally committed as revision 21310 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-18 23:56:04 +00:00
Baptiste Coudurier
c956611527 move aspect ratio code at the end of the track parsing, fix cathedral-beta2-400extra-crop-avc.mp4 
Originally committed as revision 21301 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-18 21:38:39 +00:00
Luca Abeni
22c1f65fa6 Rename the RTP muxer sources so that the packetisation functions are in 
rtpenc_*.c files.

Originally committed as revision 21284 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-18 13:44:12 +00:00
Luca Abeni
47a855648f Remove the ff_rtp_send_h264() prototype from rtp_h264.h (such function 
belongs to the RTP muxer, and its prototype already is in rtpenc.h)

Originally committed as revision 21282 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-18 11:18:25 +00:00
Ben Littler
5bc3fc2187 add uldx fourcc to mpeg4 in riff.c 
Originally committed as revision 21279 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-18 03:57:01 +00:00
Ben Littler
6667d5a5e5 add vspx fourcc to mpeg4 in riff.c 
Originally committed as revision 21269 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-17 19:25:49 +00:00
Stefano Sabatini
ade5b91dda Use av_match_ext() rather than the deprecated match_ext(), fix 
warnings.

Originally committed as revision 21263 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-17 15:57:51 +00:00
Måns Rullgård
48fdb66c68 Fix comment typo carefull -> careful 
Spotted by someone on IRC.

Originally committed as revision 21261 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-17 13:39:34 +00:00
Carl Eugen Hoyos
45becaf337 Fix indentation after r21257. 
Originally committed as revision 21258 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-17 00:27:22 +00:00
Michael Karcher
1454618426 Support demuxing of Sony OpenMG files without metadata header. 
Original patch by Michael Karcher, ffmpeg A mkarcher dialup fu-berlin de

Originally committed as revision 21257 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-17 00:23:08 +00:00
ami_stuff
8be7ac98ca Support decoding of SoftLab-NSK VideoTizer. 
Patch by ami_stuff, ami_stuff o2 pl

Originally committed as revision 21245 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-16 13:13:49 +00:00
Måns Rullgård
a482e61bd6 Add symbol versioning for shared libraries 
Based on patch by Reinhard Tartler <siretart tauware de>

Originally committed as revision 21236 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-16 04:49:02 +00:00
Carl Eugen Hoyos
59ea69ef54 Support decoding of Avid uncompressed mov files, fixes issue 1685. 
Originally committed as revision 21223 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-15 11:03:40 +00:00
Carl Eugen Hoyos
a0ae3e41f3 Support decoding Avid 1:1x codec, (partially) fixes issue1684. 
Originally committed as revision 21222 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-15 10:55:31 +00:00
Peter Ross
574b183d64 Latent libavformat version bump and documentation update for Adobe Filmstrip muxer and demuxer (r21212) 
Originally committed as revision 21213 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-14 14:02:06 +00:00
Peter Ross
83ab7f1883 Adobe Filmstrip muxer and demuxer 
Originally committed as revision 21212 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-14 12:55:44 +00:00
Andrew Wason
ff5ab5c8c9 set stream aspect from mov tkhd width/height, patch by Andrew Wason, rectalogic at rectalogic dot com 
Fixes issue 671.

Originally committed as revision 21210 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-14 00:32:36 +00:00
Baptiste Coudurier
49544546b0 do not skip mdat data if it's the last atom, avoids one seek 
Originally committed as revision 21209 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-13 23:33:29 +00:00
Baptiste Coudurier
08c8e66a99 restore old buffer content when seek failed in http protocol, fix issue #1631 
Originally committed as revision 21208 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-13 23:27:52 +00:00
Baptiste Coudurier
a1f42882e1 revert wrongly commited hunk in r21205 
Originally committed as revision 21207 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-13 22:57:37 +00:00
Baptiste Coudurier
10061cd648 remove useless type declarations 
Originally committed as revision 21206 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-13 22:52:22 +00:00
Baptiste Coudurier
dcc2220ab5 remove useless declarations from mpegts.h 
Originally committed as revision 21205 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-13 22:50:26 +00:00
Baptiste Coudurier
33931016e5 use codec rc_max_rate if set and warn if bit rate is not set 
Originally committed as revision 21204 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-13 22:23:29 +00:00
Baptiste Coudurier
01d6bd525a Do not split audio frames accross pes packets. 
This was not supported by some equipment and cisco analyzer.

Originally committed as revision 21203 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-13 22:21:45 +00:00
Mike Scheutzow
907d916627 print more debug info about muxing parameters, patch by Mike Scheutzow, scheutzow at alcatel-lucent dot com 
Originally committed as revision 21201 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-13 21:42:55 +00:00
Mike Scheutzow
c054f372e0 update mpegts_write_pes documentation, patch by Mike Scheutzow, scheutzow at alcatel-lucent dot com 
Originally committed as revision 21200 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-13 21:40:37 +00:00
Mike Scheutzow
4df3bbbc68 Insert null packets to keep pcr values correct, patch by Mike Scheutzow, 
scheutzow at alcatel-lucent dot com and Niobos, niobos at dest-unreach dot be.

Originally committed as revision 21199 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-13 20:44:56 +00:00
Mike Scheutzow
49f6fd8f3f move pcr/sdt/pat period computation after ts->mux_rate is set, patch by Mike Scheutzow, scheutzow at alcatel-lucent dot com 
Originally committed as revision 21198 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-13 20:30:55 +00:00
Mike Scheutzow
6b18a3f5ba output a pcr as soon as possible, patch by Mike Scheutzow, scheutzow at alcatel-lucent dot com 
Originally committed as revision 21197 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-13 20:26:59 +00:00
Niobos
906c16a11a fix ts packet header size computation, patch by Niobos, niobos at dest-unreach dot be 
Originally committed as revision 21196 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-13 20:20:05 +00:00
Niobos
080cabffca fix sdt, pat, pcr size computation, patch by Niobos, niobos at dest-unreach dot be 
Originally committed as revision 21195 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-13 20:14:53 +00:00
Luca Abeni
fad9a42ad4 The RTP muxer does not need rtp_asf.c 
Originally committed as revision 21194 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-13 18:27:21 +00:00
Luca Abeni
3f60d2d327 Remove the inclusion of unneeded headers 
Originally committed as revision 21193 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-13 18:18:21 +00:00
Ronald S. Bultje
9d50d39629 Fix issue1658 (trailing space in rtpmap descriptor). 
Originally committed as revision 21187 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-13 15:55:42 +00:00
Tomas Härdin
094a63f1f6 Check there is a stream before writing header. 
Patch by Tomas Härdin: $(name) punto hardin chez codemill dot se

Originally committed as revision 21186 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-13 14:32:48 +00:00
Ronald S. Bultje
2edabfdfdb Reindent after r21166. 
Originally committed as revision 21167 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-12 16:36:23 +00:00
Tomas Härdin
08f7a8ac32 Use chunked encoding for HTTP uploads. Patch by Tomas Härdin 
<$firstname.$lastname()codemill,se>.

Originally committed as revision 21166 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-12 16:36:00 +00:00
Martin Storsjö
51a269cd97 Make sure the destination address is written as an IP address in the SDP 
Patch by Martin Storsjo (martin AT martin DOT st)

Originally committed as revision 21163 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-12 10:56:43 +00:00
Sergiy
56e29bf2c9 Correct timestamps inside FLV data received by RTMP. 
Patch by Sergiy (gmail(piratfm))

Originally committed as revision 21161 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-12 07:10:47 +00:00
Art Clarke
e2ee11e868 Use old-style RTMP handshake for old servers. 
This fixes issue streaming from Red5 server.
Patch by Art Clarke (aclarke@`echo xyzzy|sed s/y/u/|sed s/y/le/|tr z g`.com)

Originally committed as revision 21160 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-12 06:44:49 +00:00
Carl Eugen Hoyos
0941ee0fa6 Support uncompressed ("Resolution 1:1") Avid AVI Codec, (partially) fixes issue 1474. 
Originally committed as revision 21154 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-12 00:29:26 +00:00
Luca Abeni
4bf0faaafe Remove the inclusion of unneeded headers 
Originally committed as revision 21152 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-11 19:55:14 +00:00
Martin Storsjö
5d629b72cb Provide a fallback for getnameinfo() also. Patch by Martin Storsjö 
<$firstname()$firstname,st>.

Originally committed as revision 21150 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-11 17:45:17 +00:00
Martin Storsjö
34a65f1fdd Implement a fallback for struct sockaddr_storage if not available. 
Patch by Martin Storsjö <$firstname()$firstname,st>.

Originally committed as revision 21149 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-11 17:42:35 +00:00
Martin Storsjö
fdcdd5396e Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsjö 
<$firstname()$firstname,st>.

Originally committed as revision 21147 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-11 17:32:40 +00:00
Martin Storsjö
f1888474fa Deprecate resolve_host(). Patch by Martin Storsjö <$firstname()$firstname,st>. 
Originally committed as revision 21146 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-11 17:28:55 +00:00
Martin Storsjö
fa053ca725 Provide fallback implementations of getaddrinfo() and freeaddrinfo(). 
Patch by Martin Storsjö <$firstname()$firstname,st>.

Originally committed as revision 21145 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-11 17:27:07 +00:00
Ronald S. Bultje
7e43f74a37 Use getaddrinfo(), if available, in resolve_host(). Patch by Martin 
Storsjö <$firstname()$firstname,st>.

Originally committed as revision 21143 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-11 17:14:16 +00:00
David Conrad
2d4970d88d oggdec: Set dts when known 
Originally committed as revision 21134 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-11 05:51:09 +00:00
David Conrad
18ca491bf1 mkvdec: Avoid divide-by-zero crash on invalid real audio tracks 
Originally committed as revision 21129 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-11 00:31:55 +00:00
David Conrad
24ca518bd1 Add support for dirac in ogg 
Originally committed as revision 21128 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-11 00:31:52 +00:00
Carl Eugen Hoyos
e6a9dd6a7d Use enum CodecID where appropriate. 
Originally committed as revision 21119 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-10 08:57:20 +00:00
Peter Ross
e6565055b9 Deluxe Paint Animation demuxer 
Originally committed as revision 21118 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-10 05:47:50 +00:00
Peter Ross
add5badbc1 do not create Electronic Arts audio stream when unsupported revision2 audio codec is present [issue1516] 
Originally committed as revision 21116 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-10 05:08:42 +00:00
Peter Ross
8600106ac2 update my email address 
Originally committed as revision 21106 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-09 03:31:13 +00:00
Ronald S. Bultje
f9664ca026 Use the correct ByteIOContext in extradata parsing.Fixes half of issue 
1658.

Originally committed as revision 21095 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-08 17:15:46 +00:00
Art Clarke
f2e77e4b1e Improve avformat_version() doxy. 
Patch by Art Clarke.

Originally committed as revision 21081 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-08 03:43:48 +00:00
Martin Storsjö
b827f4eb47 Currently, the replacement which is used if inet_aton isn't available, 
only works correctly on little-endian. The attached patch makes it endian
independent.

Patch by Martin Storsjö <$firstname()$firstname,st>.

Originally committed as revision 21080 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-08 00:04:23 +00:00
Ronald S. Bultje
84f0aba18d handler can be NULL if we did not support this dynamic format (codec). 
Fixes issue 1658 (the crasher), although the format itself is obviously
still unsupported.

Originally committed as revision 21078 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-07 23:05:19 +00:00
Ronald S. Bultje
8f3c87f3e2 Add correct log context to av_log() calls in parse_rtpmap(). 
Originally committed as revision 21072 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-07 22:44:03 +00:00
Ronald S. Bultje
c896580087 Re-indent to more closely follow general coding standards used in other 
parts of FFmpeg. Also change a starting condition; while (condition) {
... bla = bla->next; } loop into a proper for() loop.

Originally committed as revision 21071 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-07 22:41:14 +00:00
Martin Storsjö
9ea7f03aa0 Always set the destination address even if no port was found. 
Patch by Martin Storsjo (martin AT martin DOT st)

Originally committed as revision 21057 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-07 08:24:44 +00:00
Martin Storsjö
c47b0738b5 Check the URL used for the SDP destination. 
Patch by Martin Storsjo (martin AT martin DOT st)

Originally committed as revision 21056 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-07 08:11:56 +00:00
Daniel Verkamp
9df9b810c5 Handle more ADPCM codecs in av_get_bits_per_sample(). 
This removes some special-case code from riff.c.
CODEC_ID_ADPCM_G726 is still handled in riff.c as before because it is
not guaranteed to be fixed 4 bits per sample.

Originally committed as revision 21037 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-06 21:51:20 +00:00
Ben Littler
418a287cae add another mjpeg fourcc to riff.c list 
Originally committed as revision 21032 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-05 20:14:50 +00:00
Baptiste Coudurier
7b1312fa55 cosmetics, remove useless parentheses, add space 
Originally committed as revision 21025 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-04 22:59:43 +00:00
Baptiste Coudurier
a510991cff simplify error handling in mov_read_default 
Originally committed as revision 21024 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-04 22:58:19 +00:00
Baptiste Coudurier
cb41b2b6e0 remove no more needed MOVAtom.offset field 
Originally committed as revision 21023 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-04 22:51:38 +00:00
Baptiste Coudurier
7ead7e2181 remove useless code skipping data at end of hdlr atom, already done in mov_read_default 
Originally committed as revision 21022 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-04 22:48:27 +00:00
Ronald S. Bultje
0e59034ed8 Remove forward declarations. 
Originally committed as revision 21020 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-04 19:55:43 +00:00
Mike Melanson
2cf9c7ef9c Add support for these widely-used iTunes metadata fields: Album Artist, 
Grouping, and Lyrics.

Originally committed as revision 21010 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-04 02:52:40 +00:00
Stefano Sabatini
4160069067 Prefer "*FUNC_NAME(" over "* FUNC_NAME(" for XXX_configuration() and 
XXX_license() functions, consistent with the rest of FFmpeg.

Originally committed as revision 21005 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-03 14:31:25 +00:00
Stefano Sabatini
aa13b573b4 Use av_match_ext() in place of the deprecated match_ext() function. 
Originally committed as revision 21000 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-01 23:56:09 +00:00
Stefano Sabatini
8eb631fa50 Deprecate match_ext() in favor of av_match_ext(), and mark it for 
deletion at the next major bump.

Originally committed as revision 20998 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-01 23:50:10 +00:00
Stefano Sabatini
0f52ef1a00 Use av_guess_format() in place of the deprecated guess_format(). 
Originally committed as revision 20994 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-01 12:58:03 +00:00
Stefano Sabatini
94b1f33893 Reindent. 
Originally committed as revision 20993 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-01 12:52:20 +00:00
Stefano Sabatini
a1f547b94a Deprecate guess_format() in favor of av_guess_format(). 
Originally committed as revision 20991 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-01 12:46:24 +00:00
Stefano Sabatini
debe86bfed Fix typo. 
Originally committed as revision 20990 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-01 12:29:22 +00:00
Stefano Sabatini
702d0a9e85 Remove residual use of the doxygen markup which is deprecated, 
consistent with r19122.

Originally committed as revision 20989 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-01 12:28:18 +00:00
Stefano Sabatini
f48b0fa29e Document guess_format(). 
Originally committed as revision 20988 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-31 16:38:21 +00:00
Stefano Sabatini
1642ee4337 Deprecate and mark for deletion the function guess_stream_format(), 
and clone its code to ffserver_guess_format() in ffserver.c.

guess_stream_format() is hackish since it relies on some undocumented
properties of the name of the muxers (wich is currently only relevant
for the ASF muxer), and has no use outside ffserver.c.

Originally committed as revision 20987 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-31 14:12:58 +00:00
Luca Abeni
759dc2b6cc Remove outdated comments. 
Originally committed as revision 20983 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-30 17:12:29 +00:00
Luca Barbato
d7250724ef Rename internal function 
sdp_read_packet -> rtsp_fetch_packet

This way describes slightly better what it does.

Originally committed as revision 20982 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-30 16:19:28 +00:00
Luca Abeni
d3d1eae659 Remove a useless local variable. 
Originally committed as revision 20946 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-28 13:41:09 +00:00
Luca Abeni
cd7bfe4079 Remove outdated comment 
Originally committed as revision 20945 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-28 13:38:21 +00:00
Luca Abeni
b3fbe02c86 Remove an unneeded local variable. 
Originally committed as revision 20944 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-28 13:19:54 +00:00
Luca Abeni
6399c17d54 Use different dynamic payload types for audio and video. 
Originally committed as revision 20940 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-27 21:31:10 +00:00
Kostya Shishkov
8badb23e22 Recognize 16-bit Interplay Video variant 
Originally committed as revision 20927 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-27 08:21:40 +00:00
Luca Abeni
f877954fd3 Use RTP_PT_PRIVATE in sdp.c instead of hardcoding 96. 
Originally committed as revision 20922 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-26 10:59:56 +00:00
Diego Biurrun
251822897f Remove some unused variables, fixes the warnings: 
libavformat/rtmppkt.c:350: warning: unused variable ‘i’
libavformat/rtmppkt.c:349: warning: unused variable ‘base’

Originally committed as revision 20917 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-24 12:11:55 +00:00
Luca Abeni
76faff6ef2 Add support for mp3 over RTP in rtpdec.c 
Originally committed as revision 20916 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-23 21:23:26 +00:00
Michael Niedermayer
2c2a167ca7 It appears that waveformatextensible is mandatory for more cases than 
just channels>2. The 16bit case is from MSDN, the 48khz is from less a reliable
www page (sorry i cant find the URL anymore).

Originally committed as revision 20892 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-18 06:03:12 +00:00
Reimar Döffinger
4aaab0a328 Add decoder for R210 (uncompressed 10-bit RGB) codec. 
Originally committed as revision 20891 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-17 18:56:56 +00:00
Michael Tison
a3d995c1eb CD+G demuxer and decoder 
Patch by Michael Tison (gmail address: blackspike@....)

Originally committed as revision 20890 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-17 17:25:31 +00:00
Jai Menon
8993535cbb 10l : make sure probe buffer is large enough. 
Originally committed as revision 20889 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-17 13:05:37 +00:00
Michael Niedermayer
134271c232 Only add 1 index entry per keyframe. 
Idea from a patch by samsung.

Originally committed as revision 20888 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-16 21:24:04 +00:00
Jai Menon
22ff336145 Parse ID3v[12] metadata from TTA files. 
As a side-effect, this commit also fixes issue 1310.

Originally committed as revision 20886 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-16 19:18:48 +00:00
Martin Storsjö
4aaebf78f5 Reply to RTMP ping with the same value as received by client. 
Patch by Martin Storsjö ($name at $name dot \163\164)

Originally committed as revision 20881 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-16 12:49:38 +00:00
Diego Biurrun
18a49f118c Remove unused variable, fixes the warning: 
libavformat/apetag.c:38: warning: unused variable `l'

Originally committed as revision 20878 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-15 23:41:22 +00:00
Benjamin Larsson
8c0c11229e Fix breakage introduced by setting the sample_fmt to SAMPLE_FMT_NONE (r20623). This makes 
streaming to ffserver work again.

Originally committed as revision 20869 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-14 21:08:21 +00:00
Michael Niedermayer
cc38e063be Revert flvdec.c part of r20836 
Log:
	Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
	arrays of fixed length.
	Code from ffmbc with changes to adapt to our metadata API.
Reason: memleak & fix is not trivial

Originally committed as revision 20866 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-14 15:59:19 +00:00
Daniel Verkamp
8e9efe4392 FLV 8-bit PCM is unsigned, not signed 
Fixes issue #1569

Originally committed as revision 20853 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-14 03:30:25 +00:00
Michael Niedermayer
02483df478 Make sure the Metadata: header is not printed if the only metadata will not 
be displayed. (idea from ffmbc)

Originally committed as revision 20850 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-13 23:39:20 +00:00
Michael Niedermayer
b298daea1a Move dump_metadata() to where it is in ffmbc, looks better. 
Originally committed as revision 20849 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-13 23:34:46 +00:00
Michael Niedermayer
229303d16c indent 
Originally committed as revision 20848 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-13 23:31:01 +00:00
Michael Niedermayer
4d9b678448 Skip dumping language twice. 
This looks too ugly. Idea also from ffmbc.

Originally committed as revision 20847 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-13 23:30:41 +00:00
Michael Niedermayer
2e720e11bc dump metadata for AVStreams & AVPrograms too. 
Originally committed as revision 20846 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-13 23:27:43 +00:00
Michael Niedermayer
8b5e5ec5d7 Factorize dump_metadata() out. 
Idea from ffmbc, code not, mine is a fraction of the size due to simpler
metadata API.

Originally committed as revision 20845 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-13 23:19:24 +00:00
Michael Niedermayer
cc20679a41 Try to simplify av_estimate_timings_from_pts() like in ffmbc. 
Note if this breaks for some file, report it please!

Originally committed as revision 20844 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-13 22:56:59 +00:00
Alexander Strange
35164ffe50 Correct truncated ID3v1 genre name. 
Originally committed as revision 20843 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-13 22:31:29 +00:00
Michael Niedermayer
0e500e0db2 Debug av_log() about stream probing from ffmbc. 
Originally committed as revision 20842 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-13 22:15:51 +00:00
Michael Niedermayer
0cd55b0c18 Add CODEC_ID_DNXHD into the 25 fps case. 
Merged from ffmbc.

Originally committed as revision 20841 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-13 22:12:20 +00:00
Michael Niedermayer
da457e7086 Simplify code by using av_metadata_set2(). 
somewhat based on ffmbc

Originally committed as revision 20840 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-13 21:07:47 +00:00
Michael Niedermayer
dfe9ee6b95 More entries for ff_id3v2_metadata_conv from ffmbc. 
Originally committed as revision 20839 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-13 21:02:43 +00:00
Michael Niedermayer
8a98be1a08 s/author/artist/ for ID3 
from ffmbc

Originally committed as revision 20838 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-13 21:01:49 +00:00
Michael Niedermayer
57f36fda56 More ID3v1 genres from ffmbc. 
Originally committed as revision 20837 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-13 20:51:38 +00:00
Michael Niedermayer
12ad66712a Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped 
arrays of fixed length.
Code from ffmbc with changes to adapt to our metadata API.

Originally committed as revision 20836 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-13 20:27:29 +00:00
Michael Niedermayer
a181981eb4 Add flags to prevent strdup() on arguments to av_metadata_set2(). 
I cannot use the same ABI as ffmbc as value 2 is already used in ffmpeg,
besides the name AV_METADATA_NONCONST* makes no sense to me.
Add av_metadata_set2() that takes flags.

Originally committed as revision 20834 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-13 20:22:27 +00:00
Michael Niedermayer
17986563eb Get rid of useless casts. 
Originally committed as revision 20831 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-13 17:54:09 +00:00
Michael Niedermayer
005d9b57ad Print extradata in case of failure. I had this in my local tree and it 
might be usefull for others ...

Originally committed as revision 20828 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-13 16:20:00 +00:00
Michael Niedermayer
c3d1532944 APIChanges & minor bump due to avg_frame_rate addition. 
Originally committed as revision 20827 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-13 15:55:07 +00:00
Michael Niedermayer
02b398ef49 Add avg_frame_rate. 
Originally committed as revision 20826 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-13 15:52:11 +00:00
Carl Eugen Hoyos
a76cf4e197 Use constant CODEC_ID_NONE instead of 0 where appropriate. 
Originally committed as revision 20824 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-13 15:28:00 +00:00
Michael Niedermayer
51ce8c2f87 Remove commented out code. 
Originally committed as revision 20823 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-13 15:01:09 +00:00
Kostya Shishkov
0dae3e13e3 Factor out extradata reading code. 
Borrowed from RM demuxer in FFmbc.

Originally committed as revision 20821 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-13 10:07:08 +00:00
Kostya Shishkov
119c61a30f RM audio stream version should be 16-bit followed by header size or reserved 
word, so treat it this way instead of extracting different parts from 32-bit
value.

Originally committed as revision 20820 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-13 09:08:58 +00:00
Kostya Shishkov
461ef74116 Make RM demuxer look more like proper demuxer by introducing codec tags 
instead of many strcmp() on always four-byte strings.
Idea borrowed from RM demuxer in FFmbc by Baptiste Coudurier.

Originally committed as revision 20819 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-13 08:51:27 +00:00
Kostya Shishkov
851ef8755b Factor out variable declaration 
Originally committed as revision 20818 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-13 08:44:06 +00:00
David Conrad
5e15c7d95b Fix PTS for OGM codecs. 
Fixes issue251

Originally committed as revision 20815 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-12 20:18:43 +00:00
John Stebbins
106fa129f4 Reset pts_buffers in av_read_frame_flush(). 
Patch by John Stebbins, jstebbins jetheaddev com

Originally committed as revision 20806 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-12 15:26:33 +00:00
Kostya Shishkov
cfac91fec3 Dump RTMP packet contents in debug mode 
Originally committed as revision 20799 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-11 17:13:35 +00:00
Martin Storsjö
f8caa5441b 5l trocadero: don't forget to free packet in gen_connect() 
Patch by Martin Storsjö ($name at $name dot `abbreviation for "street"`)

Originally committed as revision 20798 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-11 15:31:58 +00:00
Martin Storsjö
72b870b95b Do not try to interact with RTMP server after "stop" command was received. 
Patch by Martin Storsjö ($name at $name dot `Sao Tome and Principe domain`)

Originally committed as revision 20797 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-11 11:37:21 +00:00
Carl Eugen Hoyos
ab176fdffb (Partly) support Metasoft MJPEG Codec, fixes half of issue 1611. 
Originally committed as revision 20796 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-10 23:06:23 +00:00
Carl Eugen Hoyos
f63e5a7410 Support Etymonix MPEG-2 video codec, fixes issue 1603. 
Originally committed as revision 20795 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-10 22:38:49 +00:00
Ben Littler
4bae225126 add dvcs to dvvideo, fixes issue 1604 
Originally committed as revision 20786 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-09 20:55:47 +00:00
Carl Eugen Hoyos
4b86926b95 Support AVI1 and AVI2 in avi as MJPEG. 
Fixes issue 1602.

Originally committed as revision 20781 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-08 23:47:45 +00:00