1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Commit Graph

6697 Commits

Author SHA1 Message Date
Martin Storsjö
c690fa97e5 Reindent/rewrap
Originally committed as revision 25291 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-01 17:44:53 +00:00
Martin Storsjö
38f8c80b62 rtsp: Reorganize if statements in rtsp_read_play
Originally committed as revision 25290 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-01 17:44:18 +00:00
Martin Storsjö
ad4ad27fb6 rtsp/rtpdec: Allow rtp_parse_packet to take ownership of the packet buffer
Do the same change for ff_rdt_parse_packet, too, to keep the interfaces
similar.

Originally committed as revision 25289 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-01 17:43:27 +00:00
Martin Storsjö
96a7c9753e rtsp: Use a dynamically allocated receive buffer
Originally committed as revision 25288 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-01 17:41:31 +00:00
Tomas Härdin
8878e3b21b Add demuxer for LXF (Leitch/Harris' VR native stream format)
Originally committed as revision 25281 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-01 11:08:24 +00:00
Baptiste Coudurier
d8e456400e Correct tag is m2v1
Originally committed as revision 25271 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-30 18:12:27 +00:00
Stefano Sabatini
f3f5eb6e70 Document url_filesize().
Originally committed as revision 25268 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-30 10:55:08 +00:00
Stefano Sabatini
0a216bd1dd Make register_protocol() use the function av_register_protocol2()
rather than av_register_protocol(), which is deprecated.
Fix the GCC warning:
avio.c: In function ‘register_protocol’:
avio.c:93: warning: ‘av_register_protocol’ is deprecated (declared at avio.c:86)

Originally committed as revision 25267 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-30 10:51:22 +00:00
Baptiste Coudurier
826481ea91 Remove duplicate entries
Originally committed as revision 25264 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-29 21:35:52 +00:00
Baptiste Coudurier
3432c26319 Use new apple fourcc for mpeg-1 and mpeg-2 in mov, works natively on osx
Originally committed as revision 25263 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-29 21:34:31 +00:00
Ronald S. Bultje
3dedbeff7b Check return value of get_chunk_header(). Since enum can be unsigned, the
current code wouldn't always error out on errors.

Based on patch by Stephen d'Angelo <sdangelo evertz com>.

Originally committed as revision 25260 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-29 15:43:36 +00:00
Baptiste Coudurier
6d19fd5c26 In mov demuxer, check that nb_streams is valid before using it in read_dac3
Originally committed as revision 25240 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-28 00:33:21 +00:00
Michael Chinen
59cb40b921 Fix index_entries pos:
It was being set wrong for files with data_offset > 0

Patch by Michael Chinen, mchinen gmail

Originally committed as revision 25239 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-27 22:17:58 +00:00
Martin Storsjö
4a94cfea02 rtpproto: Use a sockaddr_storage instead of a sockaddr_in with recvfrom
Originally committed as revision 25224 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-27 16:10:23 +00:00
Tomas Härdin
1620939022 mpegtsenc: Indent
Originally committed as revision 25222 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-27 12:27:26 +00:00
Tomas Härdin
d1ac03517e mpegtsenc: Write subtitle extradata if set
Originally committed as revision 25221 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-27 12:27:23 +00:00
Michael Niedermayer
6ed040408b Move AVOptions from libavcodec to libavutil
Originally committed as revision 25210 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-26 14:25:22 +00:00
Kostya Shishkov
cba322d76d Make WMV3 decoder attempt to decode WMVP as well
Originally committed as revision 25209 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-26 13:56:50 +00:00
Stefano Sabatini
b9f9e59afc Replace deprecated CODEC_TYPE_AUDIO and CODEC_TYPE_VIDEO with the
corresponding AVMEDIA_TYPE_* symbols.

Originally committed as revision 25201 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-25 23:27:16 +00:00
Martin Storsjö
6df4029549 Add an AVOption max_delay for AVFormatContext->max_delay
This can currently also be set via -muxdelay in ffmpeg for muxers,
but not for demuxers (nor for demuxers in ffplay) - this patch
allows it to be set in all those cases.

Originally committed as revision 25180 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-24 18:04:21 +00:00
Carl Eugen Hoyos
b7d56a17ae Fix indentation after r25158.
Originally committed as revision 25160 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-23 09:53:26 +00:00
Richard Buteau
6ac6e3d123 Fix aspect ratio for files that have it stored in
ff_asf_extended_content_header.
Fixes issue 690.

Patch by Richard Buteau, rbuteau rgbnetworks com

Originally committed as revision 25158 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-23 03:40:06 +00:00
Diego Biurrun
26d5112c57 cosmetics: Place concat protocol entry in alphabetical order.
Originally committed as revision 25155 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-21 22:21:12 +00:00
Martin Storsjö
b416267622 tcp: Check both wfds and efds when waiting for the result from connect
On windows, a connection failure doesn't trigger wfds as it does on unix.

This fixes issue 2237, based on code by yeyingxian.

Originally committed as revision 25154 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-21 20:17:34 +00:00
Martin Storsjö
63206a8ffb Check for the IPPROTO_IPV6 define before using it
This fixes building on FreeBSD in some configurations, if the IPv6 multicast
structs are available, but IPPROTO_IPV6 isn't defined.

Originally committed as revision 25147 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-20 06:38:40 +00:00
Martin Storsjö
160918d588 rtsp: Handle standard assigned codec names for private payload types, too
Originally committed as revision 25126 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-15 17:39:25 +00:00
Martin Storsjö
0048a2a8d3 Handle G.722 in RTP, and all the exceptions mandated in RFC 3551
Originally committed as revision 25125 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-15 17:35:39 +00:00
Michael Niedermayer
4faf628f20 Clarify what av_read_frame() returns.
Originally committed as revision 25123 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-14 22:20:46 +00:00
Zhou Zongyi
4383692896 Add R10k decoder.
Original patch by Zhou Zongyi, zhouzy A os pku edu cn, resubmitted by
James Darnley, james.darnley gmail, changes by me.

Originally committed as revision 25115 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-13 22:08:51 +00:00
David Byron
0c41d554e2 Read all id3v2 tags at the beginning of mp3 files.
Patch by David Byron, dbyron dbyron com

Originally committed as revision 25105 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-11 16:29:23 +00:00
Tomás Touceda
16f825085a FLV Metadata
Patch by Tomás Touceda, chiiph gentoo org

Originally committed as revision 25101 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-10 23:29:07 +00:00
Måns Rullgård
324d22b2b4 nutenc: fix unstable floating-point calculations
Originally committed as revision 25095 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-10 13:16:08 +00:00
Alex Converse
20de72a447 adts demuxer: Set the time base to be the LCM of all ADTS sample rates.
Originally committed as revision 25091 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-09 23:15:17 +00:00
Martin Storsjö
9013560f13 Add a muxer and demuxer for raw G.722
Originally committed as revision 25087 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-09 19:27:41 +00:00
Baptiste Coudurier
6bd296f1e4 In mov muxer, write reduced sample aspect ratio values in pasp
Originally committed as revision 25082 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-08 20:22:02 +00:00
Baptiste Coudurier
0e7d436d92 Check dref size based on a patch by google
Originally committed as revision 25081 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-08 20:20:24 +00:00
Baptiste Coudurier
9044dd8399 In mov demuxer, do not override aspect ratio in tkhd by pasp like quicktime, fix issue #1539
Originally committed as revision 25080 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-08 20:18:14 +00:00
Christian d'Heureuse
b163078fe3 Fix formatting for negative start times (issue 2139).
Patch by Christian d'Heureuse, chdh inventec ch

Originally committed as revision 25063 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-07 21:06:21 +00:00
Justin Ruggles
bdecdd2bfc Read the number of channels from the 'dac3' tag for AC-3 in MP4.
Originally committed as revision 25054 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-06 21:52:11 +00:00
Reimar Döffinger
1b4d327b1c Add a special function to mkv demxuer to parse length values that includes
special-case code to handle all possible encodings of "unknown length".

Originally committed as revision 25049 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-06 17:51:44 +00:00
Aurelien Jacobs
b004207df4 move stream info arrays into a struct to ease future dynamic allocation
Originally committed as revision 25045 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-05 22:25:45 +00:00
Aurelien Jacobs
4a194c8f47 matroskadec: allow uint and float elements with length = 0
Originally committed as revision 25044 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-05 21:37:40 +00:00
Ronald S. Bultje
f0d8ac529f Move INET6_ADDRSTRLEN to network.h, similar to other network-related fixups
for broken OSes. This is included in rtsp.h, as opposed to os_support.h.
Should fix OS/2 broken build on fate.

Originally committed as revision 25035 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-03 20:06:01 +00:00
James Darnley
521d434fd5 Vorbis metadata writing. Patch by James Darnley <james.darnley gmail com>.
Fixes issue 555.

Originally committed as revision 25034 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-03 19:30:27 +00:00
Ronald S. Bultje
7bac991fd9 Reindent after r25032.
Originally committed as revision 25033 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-03 19:26:27 +00:00
John Wimer
619298a84d Send NAT punching messages to the address specified in the Transport:
message, if available (RFC 2326, section 12.39), fixes issue 2212.

Patch by John Wimer <john at god vtic net>.

Originally committed as revision 25032 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-03 19:25:59 +00:00
Martin Storsjö
8bb90c5394 Set frame_size in the amr demuxer
Originally committed as revision 25030 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-03 14:59:18 +00:00
Martin Storsjö
744a882f6c rtsp: 10l, try to update the correct rtp stream
This fixes a bug from rev 22917. Now RTSP streams where the individual RTCP
sender reports aren't sent at the same time actually are synced properly.

Originally committed as revision 25029 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-03 07:10:21 +00:00
Reimar Döffinger
ff6a5fc1f0 Optimize/simplify ebml_read_num.
Originally committed as revision 25026 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-02 19:17:46 +00:00
Carl Eugen Hoyos
2b50c4f6cc Cosmetics: Reindent after r25023.
Originally committed as revision 25024 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-02 11:53:09 +00:00
Andrew Wason
4ed899f2c5 Fix crash when decoding DV in AVI introduced in r24579 (issue 2174).
Patch by Andrew Wason, rectalogic rectalogic com

Originally committed as revision 25023 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-02 11:51:32 +00:00
Baptiste Coudurier
e66f8a5389 cosmetics: spaces between and after parentheses
Originally committed as revision 25021 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-01 22:58:39 +00:00
Baptiste Coudurier
eeeae2bf05 gxf muxer only accepts pal or ntsc resolutions currently, so fail if resolution is something else
Originally committed as revision 25014 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-01 00:04:47 +00:00
Tobias Bindhammer
8731c86d03 Solving memory leak and initialization problem with prev_pkt / pkt.
Originally committed as revision 25004 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-31 07:15:11 +00:00
Aurelien Jacobs
4ca31edcfe split raw.c into rawdec.c and rawenc.c
Originally committed as revision 24997 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-30 23:16:35 +00:00
Aurelien Jacobs
92aa28d292 move raw video demuxer to its own file
Originally committed as revision 24996 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-30 22:53:16 +00:00
Aurelien Jacobs
f1714d5846 move pcm muxers to their own file
Originally committed as revision 24995 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-30 22:42:25 +00:00
Aurelien Jacobs
e94204dfd8 move pcm demuxers to their own file
Originally committed as revision 24993 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-30 21:17:34 +00:00
Ben Littler
f0feb4d72f add WAWV fourcc, works on V-codecs/WAWV.avi
Originally committed as revision 24991 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-30 16:43:33 +00:00
Aurelien Jacobs
4bc16e83a7 simplify code by using the AV_NE() macro
Originally committed as revision 24986 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-29 22:21:29 +00:00
Aurelien Jacobs
8f3890404c move null muxer to its own file
Originally committed as revision 24985 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-29 22:15:50 +00:00
Aurelien Jacobs
1ac301cad8 cleanup includes which are not used anymore in raw.c
Originally committed as revision 24984 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-29 22:06:48 +00:00
Aurelien Jacobs
9e0d82418b move ac3/eac3 demuxer to its own file
Originally committed as revision 24983 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-29 22:02:47 +00:00
Aurelien Jacobs
66e35c5fc6 move dnxhd demuxer to its own file
Originally committed as revision 24982 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-29 21:51:47 +00:00
Aurelien Jacobs
170a250f7d move dirac demuxer to its own file
Originally committed as revision 24981 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-29 21:44:26 +00:00
Aurelien Jacobs
99392a6111 move h261 demuxer to its own file
Originally committed as revision 24980 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-29 21:37:37 +00:00
Aurelien Jacobs
b30593c7db move h263 demuxer to its own file
Originally committed as revision 24979 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-29 21:34:18 +00:00
Aurelien Jacobs
9243ed3f91 move h264 demuxer to its own file
Originally committed as revision 24978 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-29 21:28:51 +00:00
Aurelien Jacobs
187186c600 cosmetic
Originally committed as revision 24977 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-29 21:23:52 +00:00
Aurelien Jacobs
e35070582e move m4v demuxer to its own file
Originally committed as revision 24976 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-29 21:23:30 +00:00
Aurelien Jacobs
c3ed4b2d38 move cavsvideo demuxer to its own file
Originally committed as revision 24975 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-29 21:14:55 +00:00
Aurelien Jacobs
8c51530fa1 move mpegvideo demuxer to its own file
Originally committed as revision 24974 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-29 20:36:23 +00:00
Aurelien Jacobs
b47a5a954a move ingenient demuxer to its own file
Originally committed as revision 24973 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-29 19:16:04 +00:00
Aurelien Jacobs
6d0678d182 move DTS demuxer to its own file
Originally committed as revision 24972 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-29 19:00:40 +00:00
Aurelien Jacobs
85a2aada90 simplify code by using the AV_NE() macro
Originally committed as revision 24971 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-29 18:33:39 +00:00
Aurelien Jacobs
26aa681111 10l: aacdec and idroqenc still depend on raw.o
Originally committed as revision 24970 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-29 18:28:03 +00:00
Aurelien Jacobs
2aa751d2c8 rename idroq.c to idroqdec.c
Originally committed as revision 24969 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-29 16:37:33 +00:00
Aurelien Jacobs
54a73bb57f move id roq muxer to its own file
Originally committed as revision 24968 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-29 16:35:44 +00:00
Aurelien Jacobs
49824cb66a move ADTS AAC demuxer to its own file
Originally committed as revision 24967 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-29 16:18:20 +00:00
Josh Allmann
b20359f51a rtsp: Return AVERROR_EOF when all streams have received an RTCP BYE packet
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 24965 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-29 10:25:16 +00:00
Josh Allmann
682d28a965 Reindent
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 24964 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-29 10:20:18 +00:00
Josh Allmann
ff328c0225 rtpdec: Read RTCP compound packets
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 24963 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-29 10:19:44 +00:00
Josh Allmann
a1ba71aace rtsp: Check the RTCP file handle for new packets, too
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 24962 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-29 10:16:54 +00:00
Ronald S. Bultje
6a1712ddb5 Fix two compiler arnings related to printf-format of sizeof()-statements.
Originally committed as revision 24961 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-28 23:56:56 +00:00
Zhentan Feng
37c506e8b9 stream_selection can be freed in the fail case, in which case it's unassigned.
Therefore, init it with NULL to prevent a crash on invalid streams.

Patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 24960 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-28 23:55:26 +00:00
Tobias Bindhammer
133cc989dd Cosmetic changes.
Originally committed as revision 24944 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-26 10:03:14 +00:00
Tobias Bindhammer
2fdb2b5438 Insert info from extradata into header
Originally committed as revision 24943 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-26 10:03:11 +00:00
Tobias Bindhammer
9e906bb1bf Added option to write frames interleaved (yet disabled)
For this reason, a MuxerContext and write_trailer()-function was added,
to track the previous packet and flush the last packet at the end.

Originally committed as revision 24942 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-26 10:03:09 +00:00
Andreas Öman
f06d6c751f Make stub version of ff_sdp_write_media() match its prototype
Used when compiled without CONFIG_RTP_MUXER

Fallout from r24915

Originally committed as revision 24935 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-25 21:07:04 +00:00
Josh Allmann
186f1ec5f4 Add rtp_get_rtcp_file_handle function
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 24929 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-25 17:32:59 +00:00
Martin Storsjö
7934b15d5a Handle IPv6 in the RTSP code
Originally committed as revision 24925 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-25 15:32:29 +00:00
Martin Storsjö
3fbd12d109 Handle IPv6 in the SDP demuxer
Originally committed as revision 24924 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-25 15:32:00 +00:00
Martin Storsjö
2401660d2f rtsp: Return EOF if the TCP control channel is closed
Originally committed as revision 24920 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-25 13:42:17 +00:00
Martin Storsjö
5a8693ef59 Reindent
Originally committed as revision 24919 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-25 13:31:33 +00:00
Martin Storsjö
7ad526d288 Simplify resolve_destination in sdp.c further, now that we don't enforce IPv4 any longer
Originally committed as revision 24918 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-25 13:30:06 +00:00
Martin Storsjö
1272ae7e50 10l, add new function parameters to resolve_destination for !config_network too
Originally committed as revision 24917 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-25 12:51:20 +00:00
Martin Storsjö
cc83027c67 Reindent, rewrap lines
Originally committed as revision 24916 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-25 12:34:42 +00:00
Martin Storsjö
7ad1dc5447 Properly handle IPv6 addresses in the SDP generation
Originally committed as revision 24915 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-25 12:29:32 +00:00
Josh Allmann
7f3468d392 rtp: Replace hardcoded RTCP packet types with defines
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 24912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-25 09:15:31 +00:00
Måns Rullgård
668338c573 avformat: free decryption key in av_close_input_stream()
Originally committed as revision 24899 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-24 15:08:53 +00:00
Tobias Bindhammer
bb07ab7cf2 fixed some return values and deprecated CODEC_TYPE_VIDEO.
dithering (faster) along a linear gradient now.

Originally committed as revision 24898 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-24 14:02:31 +00:00
Måns Rullgård
ac9c19da66 asfcrypt: fix unaligned accesses with armcc
Compilers may assume a pointer has natural alignment, even if it was
assigned from a pointer type with weaker alignment requirements.  It
is thus not safe to assign a possibly unaligned value to a pointer,
regardless of how it is subsequently dereferenced.

Originally committed as revision 24897 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-24 13:42:28 +00:00
Måns Rullgård
e955bf3b42 asfcrypt: fix unaligned read in ff_asfcrypt_dec()
Originally committed as revision 24886 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-23 15:38:57 +00:00
Luca Abeni
952139a322 Do not use the server SSRC as client SSRC in the RTP demuxer
Originally committed as revision 24879 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-23 11:53:27 +00:00
Tobias Bindhammer
b7cf4e4f55 enabling codec and muxer by registering it in allcodec.c and allformat.c and adding files to the build-system
Originally committed as revision 24878 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-23 11:52:34 +00:00
Tobias Bindhammer
901694f160 Corresponding muxer for the a64 codec
Originally committed as revision 24875 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-23 11:47:50 +00:00
Ronald S. Bultje
f5ea69b235 MMSH support, the most popular and widely used of all MMS variants. Written by
Zhentan Feng <spyfeng gmail com> as part of Google's Summer of Code program.

Originally committed as revision 24861 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-21 19:04:41 +00:00
Aurelien Jacobs
364cacc7c7 add FF_API_URL_RESETBUF define to disable the deprecated url_resetbuf()
public function

Originally committed as revision 24841 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-19 21:28:43 +00:00
Aurelien Jacobs
838b27b42c add FF_API_REGISTER_PROTOCOL define to disable the deprecated
register_protocol() function

Originally committed as revision 24840 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-19 21:21:32 +00:00
Måns Rullgård
b2125520e7 applehttp: define _XOPEN_SOURCE=600 as required for usleep()
Originally committed as revision 24839 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-19 17:07:12 +00:00
Aurelien Jacobs
404eba44b1 add FF_API_URL_CLASS define to enable usage of URLContext as a AVClass
Originally committed as revision 24835 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-19 16:49:08 +00:00
Martin Storsjö
cd223e0b4e Add Apple HTTP Live Streaming demuxer
Originally committed as revision 24834 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-19 14:54:37 +00:00
Martin Storsjö
e55ebcc3f6 Move the definition of the maximum url size for static buffers to internal.h
Originally committed as revision 24833 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-19 14:50:40 +00:00
Martin Storsjö
f9c399c4fd Make parse_key_value from httpauth a common lavf internal function
Originally committed as revision 24832 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-19 14:49:53 +00:00
Aurelien Jacobs
25ae798c87 add a comment to clarify that FF_API_* defines are not part of public API
Originally committed as revision 24826 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-18 20:37:32 +00:00
Aurelien Jacobs
54036be11a rename LAVF_API_* defines to FF_API_* to clarify that it is not public API
Originally committed as revision 24825 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-18 20:34:31 +00:00
Alexander Kojevnikov
18bbe9df9a Support unsynchronisation for id3v2 tags.
Patch by Alexander Kojevnikov, alexander kojevnikov com

Originally committed as revision 24824 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-18 16:29:46 +00:00
Thierry Foucu
df4f1d5108 Add AVC EOS tag to H264-encoded FLV files.
Patch by Thierry Foucu, tfoucu gmail

Originally committed as revision 24820 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-18 09:39:21 +00:00
Aurelien Jacobs
dd872bf49f add LAVF_API_OLD_METADATA define to disable the deprecated metadata API
Originally committed as revision 24818 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-17 20:23:19 +00:00
Aurelien Jacobs
072e3efd1b add LAVF_API_MAX_STREAMS define to disable the deprecated MAX_STREAMS API
Originally committed as revision 24817 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-17 19:30:21 +00:00
Aurelien Jacobs
e110e968fe matroskadec: minor simplification
patch from reimar

Originally committed as revision 24804 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-17 14:25:14 +00:00
Aurelien Jacobs
4f90688b6e matroskadec: fix integer overflow
patch from reimar

Originally committed as revision 24803 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-17 14:05:23 +00:00
Josh Allmann
51291e6005 Add RTP depacketization of VP8
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 24798 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-16 14:23:35 +00:00
Josh Allmann
7b18d94cb3 Add RTP packetization of VP8
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 24797 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-16 14:21:17 +00:00
Ronald S. Bultje
63638a3c4a Print error messages in case of connection failure or name resolution failure
in tcp.c.

Originally committed as revision 24796 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-14 20:34:51 +00:00
Ronald S. Bultje
afbc4d2dac Prevent overflow on random input.
Originally committed as revision 24795 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-13 20:06:18 +00:00
Ronald S. Bultje
67197656d1 Remove use of MAX_STREAMS in MMSContext->streams[] array. Instead, dynamically
allocate the array.

Originally committed as revision 24794 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-13 17:30:01 +00:00
Zhentan Feng
c46000c1ff Set fixed chunksize for ASF header in MMS streams, as per MSDN documentation.
This fixes playback of at least one MMST stream.

Patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 24793 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-13 17:08:57 +00:00
Zhentan Feng
99ab8ff049 Fix wrong command prefix for timing test in MMST protocol.
Patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 24792 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-13 17:02:37 +00:00
Martin Storsjö
1ddc176ec4 Add RTP depacketization of MP4A-LATM
Originally committed as revision 24790 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-12 21:07:17 +00:00
Ronald S. Bultje
27014bf5a3 Send OPTIONS request at a regular basis to standard RTSP servers as well,
this prevents a time-out which closes the TCP connection and kills our
session.

see "Re: [FFmpeg-devel] [PATCH] rtsp.c: keep-alive" thread on mailinglist.

Originally committed as revision 24785 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-12 13:39:38 +00:00
Ronald S. Bultje
d68776d54f Add another missing file from r24799.
Originally committed as revision 24784 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-12 02:01:33 +00:00
Baptiste Coudurier
d2064fd42b Fix segv when stream copy and validate_tag fails, st->codec->codec is not set
Originally committed as revision 24782 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-12 00:35:19 +00:00
Ronald S. Bultje
6ef14e5753 Add missing mms.c from r24779.
Originally committed as revision 24780 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-11 23:45:05 +00:00
Zhentan Feng
fcd11c61ea Move functions and structs shared between MMSH and MMST into their own file,
mms.c. Patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 24779 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-11 22:50:17 +00:00
Zhentan Feng
edce93536a Extract fields that are to be shared between MMST/MMSH into a common struct,
MMSContext. The other MMST-specific members go into MMSTContext.

Patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 24778 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-11 22:43:54 +00:00
Ronald S. Bultje
a46cd6e141 Use FFALIGN() in mmst.c where appropriate. Noticed by Benoit Fouet.
Originally committed as revision 24777 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-11 22:27:29 +00:00
Stefano Sabatini
983ec30497 Add documentation for the pm parameter of the av_metadata_set*
functions.

Originally committed as revision 24771 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-11 14:38:19 +00:00
Stefano Sabatini
32e6f246b3 Fix reference to a wrong parameter name in the metadata API functions
doxies.

Originally committed as revision 24770 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-11 14:38:16 +00:00
Stefano Sabatini
fd7b11d027 Nit: fix weird spacing.
Originally committed as revision 24762 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-11 09:13:58 +00:00
Stefano Sabatini
26cc5310f6 Add empty newlines between function descriptions and @params, improve
readability.

Originally committed as revision 24761 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-11 09:13:53 +00:00
Przemysław Sobala
ec973f45a3 Fix mem leak when trying to open a non-existing image file (issue 2126).
Patch by Przemysław Sobala, psobala wp-sa pl

Originally committed as revision 24757 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-10 17:27:22 +00:00
Aurelien Jacobs
3c0eec06d8 get rid of MAX_STREAMS limit in nutdec
Originally committed as revision 24755 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-10 16:36:36 +00:00
Martin Storsjö
f53b9a2964 rtpenc_xiph: Clarify that num_frames shouldn't ever get larger than max_frames_per_packet
Originally committed as revision 24754 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-10 08:37:19 +00:00
Aurelien Jacobs
6b2b337657 get rid of MAX_STREAMS limit in mpegts
Originally committed as revision 24753 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-09 23:21:08 +00:00
Aurelien Jacobs
be73ba2fa4 get rid of MAX_STREAMS limit in RTSP
Originally committed as revision 24752 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-09 23:00:13 +00:00
Aurelien Jacobs
dfdb353cd5 get rid of MAX_STREAMS limit in RDT
Originally committed as revision 24751 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-09 22:58:54 +00:00
Martin Storsjö
b5c4bb989d rtpenc_xiph: Set the ident value via a define
Originally committed as revision 24749 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-09 10:31:59 +00:00
Martin Storsjö
62c7e2c336 rtpenc_xiph: Don't needlessly cast pointers to integers
Originally committed as revision 24748 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-09 10:23:26 +00:00
Martin Storsjö
311baee795 Make hex_to_data a lavf internal function
This is useful for other future RTP depacketizers

Originally committed as revision 24747 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-09 10:05:33 +00:00
Martin Storsjö
f240ed18ef http: Return EOF at the end of the content even if the connection isn't closed
We do request Connection: close, but some servers ignore it.

Originally committed as revision 24746 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-09 08:14:48 +00:00
Alex Converse
73c44cb286 oggparsevorbis: Add some sanity checks to header packet ordering/presence.
Originally committed as revision 24740 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-07 21:30:34 +00:00
Reinhard Tartler
2901cc9a95 Fix spelling in comment(s)
Originally committed as revision 24737 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-07 14:11:43 +00:00
Josh Allmann
91af5601c1 Add RTP packetization of Theora and Vorbis
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 24735 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-07 11:16:07 +00:00
Luca Barbato
d93fdcbf5c Preserve status reason
It is used to provide meaningful error messages.

Originally committed as revision 24714 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-06 10:26:30 +00:00
Martin Storsjö
504de2ec8f rtpdec_xiph: Split packets in the depacketizer
The vorbis decoder doesn't handle more than one audio frame packed into
the same AVPacket, so they need to be split in the depacketizer.

Originally committed as revision 24704 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-05 04:42:36 +00:00
Zhentan Feng
aaa91aa00e Move read_mms_packet() code to be inlined in the calling function.
Patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 24700 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-04 22:34:43 +00:00
Zhentan Feng
05fc9a1bcf Remove is_playing variable.
Patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 24699 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-04 22:33:38 +00:00
Zhentan Feng
b949875bf6 Move send_media_packet_request() and clear_stream_buffers() up.
Patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 24698 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-04 22:32:43 +00:00
Martin Storsjö
737b3972b5 rtpdec_xiph: Correct the bitmask for num_pkts
Originally committed as revision 24696 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-04 17:22:25 +00:00
Benoit Fouet
eea72ee863 Fix doxygen comment.
Originally committed as revision 24663 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-02 07:28:35 +00:00
Alex Converse
f7cf0f3148 Add WebM to the Matroska demuxer name.
Originally committed as revision 24639 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-01 00:30:37 +00:00
Aurelien Jacobs
f138fa78a3 100l: av_freep() needs the address of the pointer
Originally committed as revision 24613 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-30 23:41:12 +00:00
Martin Storsjö
965a3ddb1f Remove mostly unnecessary rtpdec_*.h files, store the declarations in one file
Originally committed as revision 24596 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-30 12:04:27 +00:00
Aurelien Jacobs
37287d41f4 avidec: demux ASS and SRT tracks out of GAB2 chunks
Originally committed as revision 24579 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-29 22:17:30 +00:00
Aurelien Jacobs
ac066b83e9 add seeking support in ASS demuxer
Originally committed as revision 24578 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-29 22:10:22 +00:00
Reimar Döffinger
8250561149 Check for udp_set_remote_url error.
Fixes issue 1784 (hang with nonsense URL/no network available).

Originally committed as revision 24575 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-28 16:27:16 +00:00
Martin Storsjö
2845006608 rtsp: Move the definition of SDP_MAX_SIZE up, use it in the RTSP muxer, too
Originally committed as revision 24571 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-28 09:26:15 +00:00
Baptiste Coudurier
f0187d20d1 In wav muxer, always flush in write_trailer, fix pipe output
Originally committed as revision 24568 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-28 08:17:02 +00:00
Alexander Kojevnikov
ff58de29f1 Skip short padding in id3v2.
Patch by Alexander Kojevnikov, alexander kojevnikov com

Originally committed as revision 24567 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-28 08:06:52 +00:00
Josh Allmann
42c63263d1 rtpdec_xiph: Handle the sampling SDP parameter
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 24565 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-28 06:43:58 +00:00
Reimar Döffinger
f8a169ac8e Add extern to mxf_d10_muxer forward declaration to avoid a redundant
redeclaration warning.

Originally committed as revision 24564 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-28 05:48:48 +00:00
Michael Niedermayer
a20df85886 Fix doxy that refers to the wrong variable.
Originally committed as revision 24549 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-27 15:54:26 +00:00
Michael Niedermayer
ec906fcdd7 Fix 2 doxy comments that referred to the wrong variable.
Originally committed as revision 24547 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-27 15:21:29 +00:00
Michael Niedermayer
76c56376ca Make doxygen formatting more consistent.
Originally committed as revision 24546 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-27 15:20:02 +00:00
Stefano Sabatini
88ad2faff8 Place the concat protocol entry at the begin of the registered
protocol list, restore alphabetical order.

Originally committed as revision 24545 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-27 14:34:56 +00:00
Alex Converse
ac3ccbc0e2 Document existing rules for AVInputFormat.name.
Originally committed as revision 24544 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-27 14:13:24 +00:00
Alexander Kojevnikov
2a758efe31 Make frames unsigned.
Patch by Alexander Kojevnikov, alexander kojevnikov com

Originally committed as revision 24540 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-27 10:11:05 +00:00
Alexander Kojevnikov
49d7ef282d Show correct bitrate for VBR MP3 files.
Patch by Alexander Kojevnikov, alexander kojevnikov com

Originally committed as revision 24539 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-27 10:08:34 +00:00
Måns Rullgård
8a0f61c4fb Remove duplicate initialiser for cavsvideo_muxer.extensions
The extensions field was initialised first to "cavs", then to "avs".
The name "cavs" is kept since this is used for the format elsewhere
and "avs" is already used for avisynth files.

Originally committed as revision 24538 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-27 08:21:23 +00:00
Josh Allmann
adc03a3406 rtpdec_xiph: Drop RTP packets that come in without a prior fragment start marker.
This can avoid segfaults in some cases.

Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 24537 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-27 08:16:03 +00:00
Måns Rullgård
4db40efa47 libavformat needs libavcore
Originally committed as revision 24536 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-27 08:03:09 +00:00
Stefan Gehrer
de29597680 add Chinese AVS encoding via external library libxavs
Originally committed as revision 24533 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-27 07:18:36 +00:00
Stefano Sabatini
126b638ea0 Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
in favor of the newly added corresponding functions
av_parse_video_size() and av_parse_video_rate() defined in
libavcore/parseutils.h.

This change also adds a linking-time dependency of libavcodec and of
libavfilter on libavcore.

Originally committed as revision 24518 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-26 23:12:28 +00:00
Ronald S. Bultje
db9cc3a55a Reindent after r24516.
Originally committed as revision 24517 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-26 22:22:42 +00:00
Ronald S. Bultje
e87b7d72c6 Use inverse error branches, i.e. instead of if(something){success} else {error},
use if(!something) {return error;} success;, which needs less indenting.

Originally committed as revision 24516 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-26 22:22:20 +00:00
Ronald S. Bultje
540ab68c64 Use av_log(.., AV_LOG_ERROR) instead of dprintf() for logging errors. This
should help in making mmst a little more userfriendly, or at least debuggable.
Also use helpful error return values instead of -1.

Originally committed as revision 24515 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-26 22:21:14 +00:00
Aurelien Jacobs
2701fd40f9 matroskaenc: add support for muxing SRT tracks
Originally committed as revision 24503 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-25 21:16:58 +00:00
Aurelien Jacobs
7b53f463b4 add mime-type for ASS muxer
Originally committed as revision 24502 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-25 19:36:20 +00:00
Martin Storsjö
752ff3ffa7 Include the correct header that actually is used, use quotes instead of angle brackets
Originally committed as revision 24501 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-25 19:12:35 +00:00
Reimar Döffinger
853a0fccce Cosmetics: fix indentation and remove a useless else.
Originally committed as revision 24495 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-25 14:35:12 +00:00
Reimar Döffinger
3aa13da970 Simplify get_byte and url_fgetc.
Originally committed as revision 24494 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-25 14:33:40 +00:00
Reimar Döffinger
e36a39066c Move ffm_close function up to avoid a forward declaration.
Originally committed as revision 24491 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-25 07:54:33 +00:00
Reimar Döffinger
527b46ba26 ffmdec: Do not manually free streams on read_header error, this is always
handled by upper layers.
Fixes double-frees (issue 2003).
Instead call ffm_close to ensure rc_eqs are freed also in the error case.

Originally committed as revision 24490 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-25 07:52:58 +00:00
Aurelien Jacobs
ba2c508d0c add SubRip muxer and demuxer
Originally committed as revision 24488 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-24 22:50:12 +00:00
Reimar Döffinger
6f2c523c85 Fix a "function declaration isn't a prototype" warning.
Originally committed as revision 24480 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-24 12:58:28 +00:00
Martin Storsjö
496c645d3b Never shrink the ByteIOContext buffer in ff_rewind_with_probe_data
If there is little unread data in the ByteIOContext buffer, this may lead
to reducing the size of the ByteIOContext buffer to little more the probe
data size. This can lead to suboptimal aviobuf behaviour, e.g. making some
demuxers fail to do short seeks backwards (if the input isn't seekable).

Originally committed as revision 24478 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-24 09:04:44 +00:00
Martin Storsjö
8dd25c52cb mpegts: Warn if unable to seek back
Originally committed as revision 24477 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-24 08:43:52 +00:00
Baptiste Coudurier
ef011e6d58 In mpegts muxer, fix rbsp trailing bits in AUD nal, fixes issue #2122
Originally committed as revision 24449 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-23 00:27:17 +00:00
Aurelien Jacobs
8a810ccbba use return value of ff_get_line()
Originally committed as revision 24402 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-21 21:41:46 +00:00
Aurelien Jacobs
b0335fd957 document ff_get_line()
Originally committed as revision 24401 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-21 21:40:50 +00:00
Aurelien Jacobs
a43416a540 improve ff_get_line to return line length
Originally committed as revision 24400 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-21 21:40:10 +00:00
Aurelien Jacobs
7c89295145 move ff_get_line to aviobuf.c
Originally committed as revision 24399 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-21 21:39:01 +00:00
Aurelien Jacobs
80769fb73f rename get_line to ff_get_line
Originally committed as revision 24398 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-21 21:35:44 +00:00
Axel Holzinger
354b757300 Zero-initialize structs/arrays with {0} instead of {}, which isn't proper C99
Patch by Axel Holzinger, aholzinger at gmx dot de

Originally committed as revision 24391 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-21 17:27:28 +00:00
Martin Storsjö
4f5340a0b1 Reindent, rewrap long comment lines to keep line length below 80 chars
Originally committed as revision 24390 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-21 17:25:09 +00:00
Martin Storsjö
bcc4cb4681 rtpdec_asf: Handle RTSP-MS packet splitting
Originally committed as revision 24389 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-21 17:17:35 +00:00
Thierry Foucu
591db22dff gxfenc: Fix ES name in the UMF media description, by using strlen instead of sizeof
Patch by Thierry Foucu, tfoucu at gmail

Originally committed as revision 24379 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-21 07:46:02 +00:00
Zhentan Feng
e4a28be67b Allow the ASF header to be transferred split over multiple packets, as some
servers happen to do. For this, we also move several header-size-related
variables to the MMSTContext.

Patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 24363 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-20 15:14:15 +00:00
Zhentan Feng
d6cc1123e3 Explicitely set the size of the "ff_asf_head1_guid" header chunk, this is
part of the spec and causes problems otherwise.

Patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 24362 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-20 15:11:44 +00:00
Zhentan Feng
cbbb10810c Align outgoing messages to 8 bytes, this is required to interact with
most servers. Also remove a case where we manually aligned to 8 bytes,
since this is now no longer needed.

Patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 24360 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-20 15:07:31 +00:00
Zhentan Feng
0c717a30e0 Fix a compile warning when compiling with DEBUG=1. The warning was:
format ‘%d’ expects type ‘int’, but argument 3 has type ‘uint64_t’

Patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 24359 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-20 15:05:45 +00:00
Zhentan Feng
9078eba062 Check the status code of each server responses, and fail if it indicates
a problem.

Patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 24358 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-20 15:01:06 +00:00
Zhentan Feng
414df121e0 Send a time test to the server, as the spec recommends.
Patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 24357 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-20 14:59:23 +00:00
Rafaël Carré
e8723e242d Lego Mindstorms RSO muxer and demuxer.
Patch by Rafaël Carré, rafael d carre a gmail

Originally committed as revision 24355 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-20 14:13:24 +00:00
Martin Storsjö
d970ec7554 asfdec: 10l, fix the minimum asf video stream header size
This fixes the regression test breakage.

Originally committed as revision 24354 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-20 13:08:10 +00:00
Martin Storsjö
fed7959271 asfdec: Don't read the video stream header if there isn't enough data
Originally committed as revision 24352 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-20 11:52:29 +00:00
Martin Storsjö
a3ab7c3249 asfdec: Handle asf_jfif_media
Originally committed as revision 24351 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-20 11:50:57 +00:00
Martin Storsjö
7428c8f599 asf: Add asf_jfif_media guid
Originally committed as revision 24350 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-20 11:50:22 +00:00
Martin Storsjö
aff4137d5f Remove an assert that was no longer correct nor relevant
Originally committed as revision 24344 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-20 09:58:30 +00:00
Carl Eugen Hoyos
2d91366cc2 Make MP43 the default fourcc for msmpeg4v3:
DIV3 is not supported on default XP and Vista installations (MP43 is).

Originally committed as revision 24343 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-20 09:44:21 +00:00
Martin Storsjö
8b6e0aec9f movenc: Free the buffer returned by url_close_dyn_buffer, regardless of the size
This fixes a leak introduced in rev 23942, since we write padding to the
buffer unconditionally.

Originally committed as revision 24342 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-20 05:23:28 +00:00
Josh Allmann
7d894aeb60 rtpdec_xiph: Avoid extra memcpy in Xiph RTP depacketizer
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 24334 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-19 18:43:20 +00:00
Aurelien Jacobs
3673f4ab08 fix av_seek_frame_binary() documentation
read_timestamp() is part of AVInputFormat, not AVCodec

Originally committed as revision 24327 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-19 14:58:37 +00:00
Peter Ross
07e6384dd8 Add doxygen @file comment block
Originally committed as revision 24326 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-19 11:50:07 +00:00
Martin Storsjö
a16ebd40d8 rtpdec_asf: Include lavu headers using quotes instead of angle brackets
Originally committed as revision 24325 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-19 11:43:33 +00:00
Martin Storsjö
76d908b3fe Include lavu headers using quotes instead of angle brackets
Originally committed as revision 24315 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-18 20:30:33 +00:00
Måns Rullgård
a1db009e6c Add MD5 protocol
This is a write-only protocol which computes the md5sum of data written,
and on close writes this to the designated output or stdout if none
is specified.  It can be used to test muxers without writing an actual
file.

Originally committed as revision 24309 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-18 20:19:08 +00:00
Måns Rullgård
2bab5d3e73 Allow all valid (and only valid) characters in URL scheme for url_open()
The URL specification allows letters, numbers, plus, hyphen, and period
in the scheme part.  The isalpha() test would allow additional characters
depending on locale settings while rejecting numbers and punctuation.

Originally committed as revision 24306 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-18 18:38:23 +00:00
Peter Ross
4863bf0d16 Remove trailing linefeed
Originally committed as revision 24303 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-18 08:15:45 +00:00
Peter Ross
1917a51809 Use correct doxygen syntax
Originally committed as revision 24302 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-18 08:13:11 +00:00
Peter Ross
5a71709467 Tele-typewriter demuxer
Originally committed as revision 24301 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-18 08:06:55 +00:00
Peter Ross
0459bf2d02 Add ff_sauce_read()
Originally committed as revision 24300 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-18 08:05:04 +00:00
Jai Menon
bbfb2c8077 avidec : Free packet if dv_produce_packet fails.
Originally committed as revision 24281 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-17 05:40:18 +00:00
Martin Storsjö
7939d0edce aviobuf: Do short seeks forward by reading and skipping data instead of a proper seek
This improves performance on e.g. seekable http.

Originally committed as revision 24280 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-17 05:26:30 +00:00
Jai Menon
a58e6ceae0 avidec : Free codec context before initializing the chained DV demuxer.
Originally committed as revision 24279 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-17 05:08:01 +00:00
Martin Storsjö
57fe80fe88 Bump minor and add APIchanges entry for url_fskip return value change.
Originally committed as revision 24278 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-16 23:31:30 +00:00
Martin Storsjö
d5e9ddeb73 url_fskip: Return an error code if the url_fseek failed
Originally committed as revision 24277 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-16 23:20:03 +00:00
Baptiste Coudurier
5c32755570 In ogg muxer, free dyn allocated buffer, fix memleak
Originally committed as revision 24276 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-16 22:36:01 +00:00
Martin Storsjö
db979afed2 http: Log a warning when receiving an error code
Originally committed as revision 24266 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-16 14:15:37 +00:00
Martin Storsjö
1537817e38 Move SPACE_CHARS back to libavformat/internal.h
It will be used by other parts of lavf now. This reverts svn rev 23846.

Originally committed as revision 24265 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-16 14:12:52 +00:00
Peter Ross
ea15d2000c remove redundant text and whitespaces from iff demuxer av_log() statements
Originally committed as revision 24246 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-15 11:43:09 +00:00
Baptiste Coudurier
22fe18c1c0 In ogg muxer, use dyn buffer to compute crc of the page, fix muxing with pipe
when page buffer is bigger than default buffer size. Max page is 65k.

Originally committed as revision 24242 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-14 23:21:18 +00:00
Aurelien Jacobs
d00a351606 matroskaenc: write DisplayUnit element to better match the spec
This makes it clear that we are specifying the aspect ratio, and not
the intended display size in pixels.

Originally committed as revision 24239 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-14 19:36:14 +00:00
Reimar Döffinger
b834becdae Pass the composition and ancillary ID for DVB subtitles via extradata instead
of sub_id, this allows detecting when that information is not available and
just decode everything.
In addition extradata is required for many codecs and thus in contrast to
sub_id generally already passed on by any programs using libav*.
Also ask for a sample if we encounter a stream with multiple/changing IDs.

Originally committed as revision 24238 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-14 17:28:40 +00:00
Josh Allmann
a59096e4a7 Add a depacketizer for QDM2
Patch by Josh Allmann, joshua dot allmann at gmail, original code
by Ronald S Bultje.

Originally committed as revision 24236 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-14 12:32:00 +00:00
Martin Storsjö
5590cc78ee rtpdec_svq3: Return the timestamp in *timestamp instead of pkt->pts
The timestamp of the first RTP packet forming the output AVPacket is
written back in *timestamp, which is used in later calculations in generic
rtpdec code (together with RTCP sync timestamps) to form the final pkt->pts
value.

Originally committed as revision 24235 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-14 12:27:26 +00:00
Martin Storsjö
d74c6145fb rtpdec: Allow depacketizers to specify that pkt->pts should be left as AV_NOPTS_VALUE
Originally committed as revision 24234 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-14 12:26:16 +00:00
Alex Converse
3cac899af9 Split the ADTS header decoder off of the ADTS parser.
The AAC decoder and ADTS-to-ASC BSF both require the header decoder
but not full parsing capabilities.

Originally committed as revision 24217 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-12 18:52:03 +00:00
Luca Barbato
bf55cf19ca Report when a method gets an error status code
That makes easier understand what went wrong.
In debug mode the whole reply gets printed.

Originally committed as revision 24212 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-12 10:17:20 +00:00