Commit Graph

6874 Commits

Author SHA1 Message Date
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
Víctor Paesa
31769dad7d Clarify the avoidance of usage of these AVStream fields.
Originally committed as revision 24198 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-11 14:56:32 +00:00
Luca Barbato
dc6cf61e33 Handle av_base64_decode return value
garbled sdp would cause crash otherwise.

Originally committed as revision 24191 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-11 11:54:48 +00:00
James Darnley
90d9d97d4d Fix ID3v1 tags in mp3 files
Patch by James Darnley, james dot darnley at gmail

Originally committed as revision 24189 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-11 11:28:46 +00:00
Reimar Döffinger
b5bc742402 Check url_fseek results in gxf demuxer.
Originally committed as revision 24179 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-10 23:42:08 +00:00
Måns Rullgård
8fc0162ac4 Add av_ prefix to bswap macros
Originally committed as revision 24170 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-10 22:12:30 +00:00
Måns Rullgård
e6b22522c9 bswap: change ME to NE in macro names
Other parts of FFmpeg use NE (native endian) rather than ME (machine).
This makes it consistent.

Originally committed as revision 24169 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-10 22:09:01 +00:00
Michael Chinen
603e5c0b71 move ff_get_v_length and ff_put_v from nutenc.c to internal.h/aviobuf.c
patch by Micheal Chinen < mchinen gmail >

Originally committed as revision 24140 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-09 12:14:33 +00:00
Michael Chinen
f8280ff4c0 rename get_length to ff_get_v_length and put_v to ff_put_v
patch by Michael Chinen < mchinen gmail >

Originally committed as revision 24139 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-09 12:10:47 +00:00
Baptiste Coudurier
efdccce500 In mpegts muxer, print VBR instead of dummy 1 when displaying muxrate
Originally committed as revision 24125 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-08 22:01:31 +00:00
Baptiste Coudurier
b015be2142 In mov muxer, write pixel aspect ratio tag in mov files.
Based on a patch by Daniel Kristjansson, danielk at cuymedia dot net

Originally committed as revision 24124 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-08 21:57:20 +00:00
Alex Converse
cfde3a7e13 Cosmetics: whitespace
Originally committed as revision 24093 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-07 20:03:15 +00:00
Aurelien Jacobs
5c7ceef654 improve long_name for ass (de)muxer
Originally committed as revision 24084 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-07 13:10:57 +00:00
Michael Niedermayer
3124766959 Ignore extradata & w/h in asf/dvr.
The w/h values are wrong and extradata contains a fake seq header that causes
decoding to fail later, a valid seq header is in the stream itself.
Partially fixes issue658

Originally committed as revision 24082 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-07 10:39:05 +00:00
Carl Eugen Hoyos
bba66fc7be Associate .tga with format image2.
Originally committed as revision 24079 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-07 10:19:59 +00:00
Måns Rullgård
defb0009cf Add #ifdefs around code specific to file and pipe protocols
Originally committed as revision 24076 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-06 14:28:32 +00:00
Måns Rullgård
7fddac9320 os_support: include some headers only when needed
Originally committed as revision 24072 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-06 11:42:52 +00:00
Måns Rullgård
81f460a373 rtpenc: remove unnecessary #include unistd.h
Originally committed as revision 24071 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-06 11:42:48 +00:00
Måns Rullgård
3f7ab648e5 file_protocol: remove redundant #include sys/time.h
Originally committed as revision 24070 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-06 11:42:46 +00:00
Martin Storsjö
0fca8d24ee rtpdec_asf: Propagate errors from the chained av_open_input_stream
This fixes the crash in issue 2070.

Originally committed as revision 24059 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-05 16:46:00 +00:00
Eli Friedman
6fa197e277 Silence a warning when compiling aviobuf.c
Patch by Eli Friedman, eli d friedman a gmail

Originally committed as revision 24055 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-05 09:11:45 +00:00
Michael Karcher
03f0d17575 Remove superfluous id3v2.o dependency for dts, eac3, gsm, mlp, shorten, and
truehd demuxers
Patch by Michael Karcher <ffmpeg at mkarcher dot dialup dot fu-berlin dot de>

Originally committed as revision 24053 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-05 04:07:50 +00:00
Michael Karcher
513d567152 Add id3v1.o dependency for oma demuxer
Patch by Michael Karcher <ffmpeg at mkarcher dot dialup dot fu-berlin dot de>

Originally committed as revision 24052 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-05 04:01:39 +00:00
David Conrad
105b37859b mov: Read Flash's chpl variant
This is based off of F4V specs rather than any actual files

Originally committed as revision 24035 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-04 04:59:12 +00:00
Eli Friedman
a07a06b033 Fix warning "passing argument from incompatible pointer type".
Patch by Eli Friedman, eli d friedman a gmail

Originally committed as revision 24020 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-03 10:25:32 +00:00
Baptiste Coudurier
9d3fdf2031 Move AVStream->codec_info_nb_frames increment after try_decode_frame
Originally committed as revision 24017 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-03 03:15:37 +00:00
Baptiste Coudurier
ae447836af In av_find_stream_info, decode at least 4 h.264 frames to be able to guess delay.
Originally committed as revision 24014 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-03 03:07:33 +00:00
Michael Niedermayer
9862f9e149 Disable dshow specific bug emulation for amv files as they arent
demuxed by ms dshows buggy demuxer normally.

Originally committed as revision 24012 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 23:39:02 +00:00
Michael Niedermayer
89ac23cd40 Rename block_align variable in the avi demuxer to clearly seperate its purpose
from the true block_align.

Originally committed as revision 24011 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 23:33:10 +00:00
Jai Menon
93eea20a79 Bump libavformat minor (as a result of r24003).
Originally committed as revision 24007 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 17:39:03 +00:00
David Conrad
41c1ccc332 matroskadec: merge only SSA packets together
fixes issue 2052
patch by David Conrad

Originally committed as revision 24004 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 16:41:38 +00:00
Aurelien Jacobs
7a617a8634 add AV_DISPOSITION_FORCED flag and use it in matroska demuxer
Originally committed as revision 24003 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 16:38:44 +00:00
Michael Niedermayer
d01144b9d3 Duplicate rounding that MS does in one of their implementations of an avi demuxer.
Fixes issue740
Based on patch by Cory Fields theuni-nospam- >xbmc @org

Originally committed as revision 23999 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 15:09:27 +00:00
Diego Biurrun
e2d17d0197 Fix doxy of flags parameter in fps_umf2avr().
Originally committed as revision 23992 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 12:50:19 +00:00
Diego Biurrun
0baf34d844 Remove angular brackets from Doxygen comments; Doxygen confuses them for HTML.
Originally committed as revision 23991 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 12:48:32 +00:00
Diego Biurrun
8a4d7a3013 Replace incorrect @NOTE Doxygen command by @note; capitalization matters.
Originally committed as revision 23980 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 11:46:29 +00:00
Diego Biurrun
b8ab52e702 Fix Doxygen function parameter documentation syntax.
Originally committed as revision 23978 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 11:41:13 +00:00
Diego Biurrun
09f6a45dc2 Remove non-existing stray arguments from Doxygen function documentation.
Originally committed as revision 23976 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 11:19:29 +00:00
Diego Biurrun
9a58234fea Fix misspelled parameter names in Doxygen documentation.
This fixes one Doxygen warning each.

Originally committed as revision 23970 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 10:49:29 +00:00
Baptiste Coudurier
29054fdd0a In mxf muxer, fix last b frame temporal offset
Originally committed as revision 23967 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 08:35:47 +00:00
John Stebbins
380966a801 In mov demuxer, fix seeking to the beginning when file has edit lists.
Patch by John Stebbins, stebbins at jetheaddev dot com
Fixes issue #2046

Originally committed as revision 23966 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 08:24:37 +00:00
Måns Rullgård
ea59f489b0 mpegtsenc: allocate correct size for PID table
Originally committed as revision 23951 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-01 23:21:23 +00:00
Andrew Wason
525fcb2798 In mov demuxer, only set sar if not already set, patch by Andrew Wason,
rectalogic at rectalogic dot com
Fixes issue #1754

Originally committed as revision 23948 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-01 23:18:27 +00:00
Baptiste Coudurier
7d6096e42e Use ext sample from mpeg4audio config if set with AAC SBR
Originally committed as revision 23947 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-01 22:31:31 +00:00
Josh Allmann
de1807bbc4 Pad the buffer in url_close_dyn_buf, for buffers opened with url_open_dyn_buf
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 23942 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-01 20:15:49 +00:00
Josh Allmann
4449df6baf Add RTP depacketization of SVQ3
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 23941 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-01 20:12:58 +00:00
Reimar Döffinger
39bb30f664 Change all functions referenced in the mxf_metadata_read_table to use the same
prototype and also always call them with exactly those arguments.
The previous way seems to have worked on all supported platforms, however
it was not strictly valid C and would crash e.g. with a compiler that
uses stdcall by default.
Also avoids warnings if -Wstrict-prototypes is used.

Originally committed as revision 23939 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-01 17:10:31 +00:00
Eli Friedman
383b25fd54 fix warning in ff_metadata_mux_compat()
warning: the address of 'number' will always evaluate as 'true'
patch by Eli Friedman   eli _dot_ friedman _at_ gmail _dot_ com

Originally committed as revision 23936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-01 15:03:21 +00:00
Alex Converse
5935f9d6bd Allow remuxing of explicitly signalled AAC files into ADTS.
The ADTS output files are not explicitly signaled because the format
does not support explicit signalling.

Originally committed as revision 23935 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-01 14:49:32 +00:00
Michael Niedermayer
8a472821a4 Factorize get_duration() out of 4 places of the avi demuxer.
Originally committed as revision 23934 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-01 13:50:15 +00:00
Howard Chu
4bbb3e3a9d Use new librtmp APIs instead of grubbing around in RTMP struct
Originally committed as revision 23928 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-01 10:59:44 +00:00
Michael Niedermayer
0c0fd063dd Prevent infinite recursion of odml indexes.
This fixes a stack overflow.

Originally committed as revision 23925 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-01 00:09:08 +00:00
XBMC
b0a18c2f0a Make "invalid dts/pts combination" a debug instead of a warning message.
Patch by XBMC

Originally committed as revision 23919 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-30 23:01:44 +00:00
Mike Scheutzow
5fd4857354 Allow setting streamid when muxing mpegts.
Patch by Mike Scheutzow, scheutzow alcatel-lucent com

Originally committed as revision 23918 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-30 22:39:13 +00:00
Måns Rullgård
49bd8e4b84 Fix grammar errors in documentation
Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-30 15:38:06 +00:00
Tomas Härdin
11fdc4d4fc mxfdec: Improve parsing of the PixelLayout item
Originally committed as revision 23898 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-30 07:55:05 +00:00
Baptiste Coudurier
2209ffacb9 In mov demuxer, increase total size after debugging message
Originally committed as revision 23864 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-28 21:02:16 +00:00
Josh Allmann
bb06ec5ef4 Reindent
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 23862 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-28 20:37:16 +00:00
Josh Allmann
a494295197 rtpdec: Clean up FMTP parsing code in AMR RTP depacketizer
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 23861 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-28 20:35:21 +00:00
Josh Allmann
af1308f024 rtpdec: Cleanup FMTP parsing code in Xiph RTP depacketizer
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 23860 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-28 20:32:03 +00:00
Josh Allmann
824535e3c6 rtpdec: Malloc the fmtp value buffer
This allows very large value strings, needed for xiph extradata.

Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 23859 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-28 20:27:25 +00:00
Josh Allmann
4332bfbff8 Reindent
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 23852 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-28 11:35:18 +00:00
Josh Allmann
efc6d45196 rtpdec: Clean up FMTP parsing code in MPEG-4/AAC RTP depacketizer
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 23851 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-28 11:30:44 +00:00
Josh Allmann
fb4ca2cb51 rtpdec: Clean up FMTP parsing code in H.264 RTP depacketizer
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 23850 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-28 11:28:02 +00:00
Josh Allmann
1ed3cef513 Reindent
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 23849 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-28 11:26:29 +00:00
Josh Allmann
7aa0118c46 rtpdec: Return ENOMEM if H.264 RTP fails to allocate memory for SDP extradata
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 23848 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-28 11:25:39 +00:00
Josh Allmann
016bc031eb rtpdec: Add generic function for iterating over FMTP configuration lines
This will be used for cleaning up code that is common among RTP depacketizers.

Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 23847 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-28 11:24:12 +00:00
Josh Allmann
8b114d85ba rtpdec: Move space_chars from avformat/internal to rtpdec
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 23846 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-28 11:21:34 +00:00
Eli Friedman
22d78b05b1 Fix an "assignment from incompatible pointer type" warning in av_read_frame_internal
Patch by Eli Friedman, eli dot friedman at gmail

Originally committed as revision 23842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-28 08:04:52 +00:00
Eli Friedman
8b4845c0b0 Remove an unused label, fixing a warning
Patch by Eli Friedman, eli dot friedman at gmail

Originally committed as revision 23828 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-27 17:51:17 +00:00
Eli Friedman
805488f0e2 Add proper const declaration to a cast, fixes a warning
Patch by Eli Friedman, eli dot friedman at gmail

Originally committed as revision 23827 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-27 17:33:52 +00:00
Måns Rullgård
f3bfe388b5 Make ff_url_split() public
ff_url_split() is retained as an alias, as it was used by ffserver,
to avoid breaking ABI compatibility with it.

Originally committed as revision 23822 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-27 14:16:46 +00:00
Eli Friedman
9b1947c7f2 Fix implicit cast warning
Patch by Eli Friedman, eli dot friedman at gmail

Originally committed as revision 23817 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-27 09:07:35 +00:00
Josh Allmann
c47f567c70 rtpdec_mpeg4: Rename PayloadContext to be consistently 'data'
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 23773 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-25 08:03:52 +00:00
Josh Allmann
ca937a5508 RTSP, rtpdec: Move RTPPayloadData into rtpdec_mpeg4 and remove all references to rtp_payload_data in rtpdec and rtsp
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 23772 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-25 08:02:50 +00:00
Josh Allmann
73e6c53e64 rtpdec: Move AAC depacketization code in rtpdec to a proper payload handler
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 23771 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-25 08:01:20 +00:00
Josh Allmann
7fc8ac7fd8 RTSP: Move more SDP/FMTP stuff from rtsp.c to rtpdec_mpeg4.c
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 23770 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-25 08:00:05 +00:00
Josh Allmann
9b3788efc3 RTSP: Decouple MPEG-4 and AAC specific parts from rtsp.c
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 23769 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-25 07:58:38 +00:00
Josh Allmann
30619e6e59 RTSP: Remove skip_spaces in favor of strspn
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 23768 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-25 07:56:45 +00:00
Jai Menon
d6a9349062 avienc : Avoid creating invalid AVI files when muxing subtitle streams
other than XSUB.

Originally committed as revision 23766 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-25 04:29:02 +00:00
Baptiste Coudurier
3491866a4b Improve mov atom parsing debug message, print parent atom and size in decimal
Originally committed as revision 23764 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-25 01:19:03 +00:00
Luca Barbato
1f563bfa15 Remove typo: s/ingore/ignore/
Originally committed as revision 23758 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-24 17:59:49 +00:00
Måns Rullgård
30cdfb49b4 asfdec: ensure number of streams is within bounds; remove VLA in asf_read_pts()
Originally committed as revision 23756 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-24 15:10:06 +00:00
Alexei Svitkine
3bb96f914e Correctly return EOF for smacker videos
Patch by Alexei Svitkine, alexei dot svitkine at gmail

Originally committed as revision 23749 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-24 06:55:53 +00:00
Martin Storsjö
02174293c6 Reindent
Originally committed as revision 23735 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-23 11:26:43 +00:00
Martin Storsjö
ed8d57665b Add all required includes to avio.h
Originally committed as revision 23734 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-23 11:26:33 +00:00
Michael Niedermayer
1d4c1c3b7a Continue after guids in asf after which other guids are possible instead of skiping
over the stored size.
Fixes issue2029

Originally committed as revision 23732 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-23 02:04:55 +00:00
Stefano Sabatini
fcd10c4f00 Mention how "now" is interpreted in the parse_date() doxy.
Originally committed as revision 23725 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-22 22:54:32 +00:00
Stefano Sabatini
82fd4f4a07 Fix date specification accepted by parse_date().
Originally committed as revision 23724 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-22 22:54:29 +00:00
Martin Storsjö
9290f15d00 Make the http protocol open the connection immediately in http_open again
Also make the RTSP protocol use url_alloc and url_connect instead of relying
on the delay open behaviour.

Originally committed as revision 23710 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-22 14:15:00 +00:00
Martin Storsjö
4167ba0bc8 Add an AVClass to the HTTPContext
Originally committed as revision 23709 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-22 14:13:55 +00:00
Martin Storsjö
a9a3364c31 Allocate the HTTPContext through URLProtocol.priv_data_size
Originally committed as revision 23708 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-22 14:12:34 +00:00
Martin Storsjö
735cf6b265 Add priv_data_size and priv_data_class to URLProtocol
This allows url_alloc to allocate and initialize the priv_data.

Originally committed as revision 23706 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-22 14:09:08 +00:00
Martin Storsjö
ffbb289a1d Split url_open and url_open_protocol into url_alloc and url_connect
Originally committed as revision 23704 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-22 14:03:37 +00:00
Martin Storsjö
9b07a2dc02 Add an av_register_protocol2 function that takes a size parameter
This allows extending the URLProtocol struct without breaking binary
compatibility with code compiled with older definitions of the struct.

Originally committed as revision 23702 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-22 13:58:48 +00:00
Stephen Dredge
5be5d28ced Fix failure in av_read_frame on timestamp rollover.
Patch by Stephen Dredge, sdredge A tpg com au

Originally committed as revision 23699 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-22 08:48:28 +00:00
Martin Storsjö
a8ead3322f RTSP: Use the same authentication for the HTTP POST session as for the GET
Originally committed as revision 23686 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-21 19:41:02 +00:00
Martin Storsjö
db30234794 HTTP: Add a method for initializing the authentication state from another connection
Originally committed as revision 23685 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-21 19:40:30 +00:00
Martin Storsjö
17b1493f74 Reindent
Originally committed as revision 23684 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-21 19:02:35 +00:00
Martin Storsjö
ea02b593a1 HTTP: Compact the code for writing chunked post data
Originally committed as revision 23683 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-21 19:02:05 +00:00
Martin Storsjö
077026ccf3 HTTP: Get rid of the is_chunked variable, use the chunksize variable instead
Originally committed as revision 23682 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-21 19:01:32 +00:00
Martin Storsjö
a6a9158973 HTTP: Clarify a comment
Originally committed as revision 23681 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-21 18:40:53 +00:00
Ronald S. Bultje
45c611a95b Reset chunksize back to zero (= no chunked encoding) after each new open
connection (e.g. a seek). This fixes the theoretical case where a server
sends a file first using chunked encoding, and then using non-chunked
encoding.

Originally committed as revision 23665 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-20 21:41:02 +00:00
Ronald S. Bultje
f37246952a Use url_write(), not http_write(), for sending the HTTP headers. This prevents
them from being sent using chunked encoding (I don't think this ever happened,
but either way it would be wrong).

Originally committed as revision 23664 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-20 21:38:16 +00:00
Carl Eugen Hoyos
2c4a10134e Add IEC958 data_types for DTS-HD (data burst described in IEC 61937-5),
E-AC-3 (61937-3 Edition 2) and TrueHD (61937-9).

Originally committed as revision 23655 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-20 11:40:41 +00:00
Martin Storsjö
10ed37b5d1 RTSP: Add the auth credentials to the HTTP tunnel URL, too
Originally committed as revision 23651 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-19 21:57:45 +00:00
Martin Storsjö
a955fc5ee7 ff_url_join: Don't add any at-char if the auth is an empty string
Originally committed as revision 23650 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-19 21:56:50 +00:00
Martin Storsjö
6217b6451a RTSP: Set the connection handles to null after closing them
This fixes a potential issue when doing redirects.

Originally committed as revision 23649 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-19 21:46:39 +00:00
Josh Allmann
00e4a1f4e2 RTSP: Don't store the connection handles in local variables
This removes some useless copying of handles, and simplifies error handling.

Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 23648 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-19 21:36:13 +00:00
Michael Niedermayer
57eb217ac4 Improve h263_probe()
Fixes issue2015

Originally committed as revision 23645 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-18 23:17:20 +00:00
Martin Storsjö
d3f84dfc0e RTSP: Clean up rtsp_hd on failure
Since rtsp_hd isn't assigned to rt->rtsp_hd until after the setup phase,
the initialized URLContext could be leaked on failures.

Originally committed as revision 23643 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-18 17:54:56 +00:00
Martin Storsjö
e8ccf24527 RTMP: Return from rtmp_read as soon as some data is available
Earlier, the function only returned when the enough data to fill the
requested buffer was available. This lead to high latency when receiving
low-bandwidth streams.

Originally committed as revision 23642 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-18 12:02:51 +00:00
Carl Eugen Hoyos
a80af87eea Add IEC958 data_types for Atrac* and WMA Pro.
Data-burst is described in IEC 61937-7 (Atrac) and IEC 61937-8 (WMA Pro).

Originally committed as revision 23641 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-18 07:54:45 +00:00
Michael Karcher
6afd0ee3b2 Add metadata support. Patch by Michael Karcher.
Originally committed as revision 23639 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-17 10:59:49 +00:00
Luca Abeni
8a2679ada4 Simplify (no need to check for st->codec->extradata) and correct
(extradata_size must be at least 5 bytes) the H.264 MP4 syntax check
in rtpenc.c

Originally committed as revision 23638 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-17 10:30:52 +00:00
Martin Storsjö
96c2ae61e6 Add the necessary includes, add an extra empty line for cosmetics
Originally committed as revision 23636 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-17 09:39:42 +00:00
Michael Niedermayer
8745fe29a9 Marking what should be removed in relation to MAX_STREAMS.
Originally committed as revision 23634 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-16 19:31:05 +00:00
Luca Abeni
8b889b3480 If the video stream is H.264 with MP4 syntax, store the NAL lenght size in
the RTP muxer context (it will be used later for splitting frames in NALs)

Originally committed as revision 23625 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-16 12:59:47 +00:00
Aurelien Jacobs
0ade7bb6e9 matroskadec : propagate AVERROR to the caller
based on a patch by Jai Menon

Originally committed as revision 23619 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-15 19:53:15 +00:00
Zhentan Feng
56023951be Fix missing logging context in a series of dprintf()s. Partially based on
patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 23614 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-15 14:24:19 +00:00
Måns Rullgård
b462d13262 Add compatibility wrappers for functions moved from lavf to lavc
When symbol versioning is enabled, moving symbols from one library to
another breaks binary compatibility.  This adds wrappers with the old
version tag for the av_*packet functions recently moved to lavc.

Originally committed as revision 23611 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-15 13:26:52 +00:00
Baptiste Coudurier
9a191b3a21 Support gray16be and rgb48be in mov
Originally committed as revision 23608 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-15 09:14:00 +00:00
Martin Storsjö
48e77473e9 Cosmetics: Change connexion to connection in code comments
Originally committed as revision 23601 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-14 09:09:59 +00:00
Josh Allmann
afcea58c53 RTSP: Shrink SDP fmtp parsing buffer size
Since the parsing of Vorbis/Theora fmtp headers is handled by the
parse_sdp_a_line function pointer now, the buffer in sdp_parse_fmtp
doesn't need to be this large any longer.

Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 23599 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-14 08:23:59 +00:00
Josh Allmann
41874d0a5d Reindent
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 23598 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-14 08:12:40 +00:00
Ramiro Polla
1f1916cea2 output-example: Set sample_fmt to SAMPLE_FMT_S16.
Originally committed as revision 23597 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-14 07:05:59 +00:00
Aurelien Jacobs
bddd1d93e5 matroskadec: fix type of the length field in ebml_read_master()
Also use the correct value for unknown size (instead of a truncated
and sign extended value).

Originally committed as revision 23591 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-11 17:16:43 +00:00
Aurelien Jacobs
739178107c matroskadec: cosmetic: indentation
Originally committed as revision 23590 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-11 16:45:38 +00:00
Aurelien Jacobs
8dbe48fccb matroskadec: add support for live broadcast containing unknown size clusters
This interrupt parsing and goes one ebml level up when encountering
a cluster start inside an unknown sized element which is not supposed to
contain a cluster.
fix issue1991

Originally committed as revision 23589 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-11 16:43:47 +00:00
Aurelien Jacobs
80702035d2 matroskadec: simplify parsing of the first cluster
Now that we save the currently parsed ebml element ID after an interruption,
we don't need to special case the parsing of the first cluster.

Originally committed as revision 23588 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-11 16:36:51 +00:00
Aurelien Jacobs
c3ade62ca3 matroskadec: store the ID of the currently parsed ebml element
This allows to interrupt parsing after reading an ID, and then properly
recover parsing.

Originally committed as revision 23587 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-11 16:34:01 +00:00
Aurelien Jacobs
6c58adf3b7 matroskadec: cosmetic: split a line to make it more readable
This also simplifies further modifications.

Originally committed as revision 23586 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-11 16:27:30 +00:00
Michael Karcher
3a1350e8d9 Generalize ID3v2 functions to support ID3v2-like ID headers with a
different magic in the header (mainly targeted to Sony's .oma/.aa3
format).

Patch by Michael Karcher, ffmpeg A mkarcher dialup fu-berlin de

Originally committed as revision 23583 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-11 13:44:57 +00:00
Michael Niedermayer
1c1697117d Fix raw vc1 decoding - this is supposed to break FATE.
Patch by Michael.

Originally committed as revision 23582 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-11 13:28:42 +00:00
Luca Abeni
ede13f55f0 Use a bitstream filter for converting the extradata syntax when generating an SDP.
This allows to generate correct SDPs for H.264 video in "MP4 syntax".

Originally committed as revision 23572 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-11 08:01:45 +00:00
Diego Biurrun
a1629e2848 Remove support for pre-Haiku, non-POSIX, non-C99 BeOS variants.
BeOS support has been broken for many years and the "maintainer" of the port
has not reacted to countless requests to get the port fixed.
approved by Mans

Originally committed as revision 23562 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-10 16:51:14 +00:00
Martin Storsjö
130b096aea Make sure the http protocol handler returns errors if a delayed open had failed
Originally committed as revision 23548 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-09 09:19:36 +00:00
Eli Friedman
461628c6a8 Fix printf format warnings
patch by Eli Friedman <eli dot friedman at gmail dot com>

Originally committed as revision 23547 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-09 08:59:41 +00:00
Martin Storsjö
bdb57a9198 Initialize the http connection in http_seek, too
This makes url_fsize return correct values for delay opened connections
that have not yet been initialized.
This fixes using the image2 demuxer with http sources.

Originally committed as revision 23546 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-09 08:29:51 +00:00
Reimar Döffinger
120a083fb7 Do not attempt to seek to index for streamed files and if the user explicitly
requested us not to read the index.

Originally committed as revision 23540 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-08 19:31:08 +00:00
Reimar Döffinger
c31f00ed63 Fix the MATROSKA_ID_TAGDEFAULT to match the specification (instead of
libmatroska etc. typo) but continue to support the "old" value.

Originally committed as revision 23539 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-08 19:28:22 +00:00
Josh Allmann
f5d33f5241 Add RTSP tunneling over HTTP
Patch by Josh Allmann, joshua dot allmann at gmail dot com

Originally committed as revision 23536 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-08 12:40:34 +00:00
Martin Storsjö
a26c3c211e Make the RTSP muxer use rtsp_hd_out, for consistency
Originally committed as revision 23535 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-08 12:26:51 +00:00
Martin Storsjö
e4f28e0890 Reindent
Originally committed as revision 23534 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-08 11:58:22 +00:00
Peter Ross
971c3c98b0 Add Pictor/PC Paint to image2 muxer/demuxer
Originally committed as revision 23533 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-08 11:55:55 +00:00
Josh Allmann
f2b9b19fad Add support for disabling chunked transfer encoding for the http protocol
Patch by Josh Allmann, josh dot allmann at gmail

Originally committed as revision 23531 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-08 11:48:03 +00:00
Martin Storsjö
701ea516ee Fix handling of errors in the http protocol
If http_connect fails, we've already stored the new connection handle in s->hd,
so clear it so http_close won't double-free it.

10l to me for not spotting it during review

Originally committed as revision 23529 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-08 11:18:22 +00:00
Martin Storsjö
4ceb8b3460 Fix bugs in the http custom header handling
Initialize the buffer av_strlcatf writes into.
Add the dash at the end of the Range header.

10l to me for not spotting it earlier

Originally committed as revision 23528 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-08 11:06:36 +00:00
Måns Rullgård
5150dd532b matroska: move LFG state from muxer context to local variable
The LFG is only used in one place, so there is no need to keep it in
the context.

Originally committed as revision 23527 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-08 10:44:27 +00:00
Josh Allmann
6964d510e8 Add the capability to write custom HTTP headers
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 23526 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-08 10:26:16 +00:00
Josh Allmann
0f3254b83d Modify the behaviour of http_open to implicitly delay connection establishment
The connection is made on the first http_read, http_write or http_seek.

Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 23525 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-08 10:04:39 +00:00
Tomas Härdin
77d3f1f792 Added M701 codec_tag for mpeg2video
Originally committed as revision 23513 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-07 11:27:26 +00:00
Reimar Döffinger
c32b701749 Do not read the RM index when input is streamed (since it requires seeking
forward and then back again) or AVFMT_FLAG_IGNIDX is set.

Originally committed as revision 23509 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-06 18:48:49 +00:00
Stefano Sabatini
d588e3f59b Add support to B4BY and R4BY NUT codec tags added in NUT r672.
Originally committed as revision 23508 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-06 18:29:42 +00:00
Michael Niedermayer
63455b8c7e bgr/rgb444 for nut
Originally committed as revision 23504 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-06 11:43:53 +00:00
Reimar Döffinger
48b5a2fa98 Support AVFMT_FLAG_IGNIDX in gxf demuxer.
Originally committed as revision 23502 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-06 10:51:06 +00:00
Michael Niedermayer
7686ab07ac Fix muxing rgb rawvideo in avi regression.
Originally committed as revision 23500 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-05 23:13:52 +00:00
Martin Storsjö
fc490fcf71 Cosmetics: Reindent/align/wrap
Originally committed as revision 23498 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-05 19:49:55 +00:00
Josh Allmann
d0382374b7 RTSP: Propagate errors up from ff_rtsp_send_cmd*
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 23497 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-05 19:45:46 +00:00
Martin Storsjö
c453d1bb8c Remove unused local variables
Originally committed as revision 23496 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-05 19:43:57 +00:00
Josh Allmann
b8c2c41d66 RTSP: Add a second URLContext for outgoing messages
Done in preparation for RTSP over HTTP.
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 23494 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-05 19:41:43 +00:00
Baptiste Coudurier
414ba8e35f More mov rawvideo fourcc
Originally committed as revision 23480 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-04 23:31:46 +00:00
Baptiste Coudurier
a7cc89e2f6 fix raw 555 pixel format, add abgr fourcc
Originally committed as revision 23479 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-04 23:30:58 +00:00
David Conrad
e7ddafd515 matroskaenc: Don't write a second seekhead for the clusters; mkvalidate agrees
with me that it's unnecessary.

Originally committed as revision 23478 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-04 22:41:11 +00:00
David Conrad
d06735a34a matroskaenc: Check that tracks was allocated
Originally committed as revision 23477 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-04 22:41:06 +00:00
David Conrad
1f4280e744 matroskaenc: Use av_get_random_seed -> lfg for segment UID
Originally committed as revision 23476 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-04 22:41:03 +00:00
David Conrad
4a6bef1f36 matroskaenc: Make put_ebml_binary take a void pointer
Originally committed as revision 23475 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-04 22:40:58 +00:00
James Zern
316d6c153c Add WebM muxer
Patch by James Zern <jzern at google>

Originally committed as revision 23474 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-04 22:40:54 +00:00
James Zern
ac9baa716b matroskaenc: Mux clusters better
Start them on keyframes when reasonable, and delay writing audio packets
to help ensure that there's audio samples available for the first frame in
clusters.

Patch by James Zern <jzern at google>

Originally committed as revision 23473 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-04 22:40:50 +00:00
Anton Khirnov
160c896c38 metadata: mention how to remove tags.
Patch by Anton Khirnov, wyskas at gmail

Originally committed as revision 23468 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-04 13:52:45 +00:00
Anton Khirnov
acf85d7b9d reindent after previous commit.
Patch by Anton Khirnov, wyskas at gmail

Originally committed as revision 23467 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-04 07:33:34 +00:00
Anton Khirnov
795c6a6b1f metadata: make conversion to the same format a noop.
Patch by Anton Khirnov, wyskas at gmail

Originally committed as revision 23466 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-04 07:32:09 +00:00
Martin Storsjö
35d8ecc54e rtspenc: Write the interleaving header in the same buffer as the packet data
Originally committed as revision 23465 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-04 06:42:39 +00:00
Martin Storsjö
dd798dcd11 http: Set http_code to 200 when doing a POST
This avoids reading and comparing uninitialized memory.

Originally committed as revision 23464 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-04 06:35:12 +00:00
Howard Chu
784824a68c Use AV_BASE64_SIZE() macro
Originally committed as revision 23462 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-04 01:15:41 +00:00
kemuri
f1dfaa7a82 win32: Use _fstati64() instead of plain old fstat() on Windows to support file
sizes greater than 4gb.

Patch by kemuri <kemuri9 at gmail dot com>

Originally committed as revision 23448 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-03 20:41:04 +00:00
Martin Storsjö
3c80491daa httpauth: Fix the length passed to av_strlcat
Since the buffer always was large enough, this bug didn't have any
effect in practice.

Originally committed as revision 23447 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-03 20:31:29 +00:00
Luca Barbato
48790d8ba8 Remove stray and possibly wrong line, rtpdec.c sets that already
Originally committed as revision 23440 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-03 16:51:29 +00:00
Stefano Sabatini
fa58643993 Make write_streamheader() log a message if there is no codec tag
defined.

Originally committed as revision 23434 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-02 21:57:40 +00:00
Stefano Sabatini
ffd5f09844 Make write_streamheader() return a meaningful error code if no codec
tag is defined, rather than return -1.

Originally committed as revision 23433 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-02 21:57:37 +00:00
Stefano Sabatini
fc0c41240e Make write_header() and write_headers() return an error code in case of
error.

Originally committed as revision 23432 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-02 21:57:35 +00:00
Stefano Sabatini
da9e6c4295 Make write_streamheader() and write_headers() accept an
AVFormatContext * in input rather than a NUTContext *, which allows to
log messages with av_log().

Originally committed as revision 23431 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-02 21:57:30 +00:00
Stefano Sabatini
b603ab8dc1 Make the error message issued in case of invalid codec tag more
informative.

Originally committed as revision 23423 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-02 10:54:53 +00:00
Ronald S. Bultje
03a3fcee99 Change default number of channels (used if unspecified in the format desc)
from 2 to 1, which is the actual value used in the spec. Fixes issue1978.

Path by John Wimer <john at god dot vtic dot net>.

Originally committed as revision 23414 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-01 20:00:26 +00:00
Michael Niedermayer
b742a12ee2 Print an error when MAX_STREAMS is reached.
Originally committed as revision 23413 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-01 19:49:21 +00:00
Martin Storsjö
27241cbffe Declare the url_write buffer parameter as const
Originally committed as revision 23401 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-01 07:46:23 +00:00
Peter Ross
0a624147c3 Prevent au_read_packet() looping endlessly when .au file contains unsupported codec type.
Originally committed as revision 23392 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-31 10:47:36 +00:00
Francesco Lavra
22a255842b Reindent after r23361.
Patch by Francesco Lavra <francescolavra interfree it>.

Originally committed as revision 23362 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-28 18:21:57 +00:00
Francesco Lavra
cff87f0404 Use ff_rm_codec_tags[] in RM muxer. This, incidentally, also allows muxing
other audio codecs rather than only AC-3, so add some code that makes
word byte-swapping only happen for AC-3, not for all audio codecs.

Patch by Francesco Lavra <francescolavra interfree it>.

Originally committed as revision 23361 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-28 18:21:25 +00:00
Francesco Lavra
74e8ccad4c Move rm_codec_tags to rm.c so muxer/demuxer can share it.
Patch by Francesco Lavra <francescolavra interfree it>.

Originally committed as revision 23360 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-28 18:18:33 +00:00
David Conrad
173bb37f82 On2 IVF demuxer
Originally committed as revision 23357 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-27 21:23:04 +00:00
Michael Niedermayer
a5266a4789 Make sure that when the parser is feeded with frame==packet that the
packets are passed through and wont be marked as static which would
require them to be copied by av_dup_packet().

Originally committed as revision 23352 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-27 17:11:37 +00:00
Stefano Sabatini
ab8f600902 Add support for the newly added Nut codec tags (added in Nut r669):
Y1[00][16], [16][00]1Y, Y3[11][16], [16][11]3Y, Y3[10][16],
[16][10]3Y, Y3[00][16], [16][00]3Y, Y4[11][ 8], Y2[00][ 8].

Originally committed as revision 23342 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-26 22:26:19 +00:00
Alex Converse
1ed87f800f Parse and repack the first frame of H.264 in ASF because SPS+PPS lives in its own packet.
Originally committed as revision 23333 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-26 04:22:52 +00:00
Alex Converse
74a6df59e3 Add an AVSTREAM_PARSE_FULL_ONCE parsing mode to parse headers and combine packets once and only once.
Originally committed as revision 23332 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-26 04:20:32 +00:00
Aurelien Jacobs
37dd235658 matroskadec: avoid potential crash after r23169
Originally committed as revision 23330 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-25 22:55:12 +00:00
Zhou Zongyi
aafb822ba5 We're using generic tag-to-ID functions, so specific codec_id assignments
are no longer necessary. Patch by Zhou Zongyi <zhouzy AT os pku edu cn>.

Originally committed as revision 23312 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-25 15:39:32 +00:00
Carl Eugen Hoyos
74c853b621 Samsung uses SIPP as FourCC for MPEG-4 ASP.
Originally committed as revision 23309 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-25 10:35:50 +00:00
trueice@gmail.com
aae9a0931c 24l trocadero: RTMP reader forgot to shift high byte of timestamp to its
proper position

Patch by trueice (his gmail account is obvious)

Originally committed as revision 23305 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-25 07:01:04 +00:00
Baptiste Coudurier
ce2a9bc3c8 In ogg muxer, use random serial number of each ogg streams
Originally committed as revision 23302 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-24 23:37:33 +00:00
Zhentan Feng
a24039861d MMS-over-TCP protocol support. Patch by Zhentan Feng <spyfeng gmail com>.
Originally committed as revision 23301 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-24 21:59:32 +00:00
Stefano Sabatini
781cf5fd41 Add missing codec id <-> codec tag entries:
CODEC_ID_RAWVIDEO <->  Y41B
CODEC_ID_RAWVIDEO <->  Y42B
CODEC_ID_RAWVIDEO <->  YUV9
CODEC_ID_RAWVIDEO <->  YVU9

These codec tags are listed in fourcc.org, and are already listed in
libavcodec/raw.c:ff_raw_pix_fmt_tags as AVI tags.

Originally committed as revision 23296 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-24 20:35:01 +00:00
Reimar Döffinger
0e765181c4 Add -f framemd5 muxer similar to framecrc.
Originally committed as revision 23289 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-24 17:49:26 +00:00
Jai Menon
9bbe9a0dc1 Display a more descriptive log message when probe buffer limit is
reached.

Originally committed as revision 23288 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-24 16:42:16 +00:00
Janne Grunau
612dc0238a Skip pes payload during probing to avoid start code emulation.
Patch by Janne Grunau, janne-ffmpeg jannau net

Originally committed as revision 23286 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-24 12:32:13 +00:00
David Conrad
7bb83d8ddf matroskaenc: Write codec time base as default duration for video tracks.
This isn't exactly semantically equivalent, but the field has already been
long abused to mean this, and writing it helps in determining a decent cfr
time base when transcoding from a mkv where the video codec stores none (VP8).

Originally committed as revision 23284 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-24 08:58:19 +00:00
Reimar Döffinger
f1a0518524 Enable AVFMT_GENERIC_INDEX for Ogg demuxer. This avoids the many
seeks needed for binary search when seeking to a previously seen
location.

Originally committed as revision 23279 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-23 23:33:38 +00:00
David Conrad
8daed34e48 matroskadec: Revert adding the doctype to metadata; it has no meaning elsewhere
Originally committed as revision 23275 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-23 22:20:04 +00:00
Benjamin Larsson
50eae97057 Reduce the score for the aea demuxer probing function.
Originally committed as revision 23273 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-23 22:01:27 +00:00
Benjamin Larsson
946da73682 Fix detection of some stereo atrac files by not comparing the
block size mode and info byte.

Originally committed as revision 23272 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-23 21:56:54 +00:00
Baptiste Coudurier
2da6050cf2 oups, 100l, revert unrelated hunk from commit r23266
Originally committed as revision 23269 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-23 21:10:05 +00:00
Baptiste Coudurier
a4de2b6ecf write 3gp perf tag for artist metadata
Originally committed as revision 23268 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-23 21:06:11 +00:00
Baptiste Coudurier
221ed48602 albm 3gp tag has optional track field not date
Originally committed as revision 23267 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-23 21:04:39 +00:00
Baptiste Coudurier
ea4c4d7fe3 change author metadata to artist in mov de/muxer
Originally committed as revision 23266 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-23 21:03:14 +00:00
Stefano Sabatini
49837b8d24 Make the nut decoder read the ff_nut_video_tags to detect codec id of
the input file.

This is required as Nut codec tags are not contained in
ff_codec_bmp_tags.

Originally committed as revision 23260 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-23 18:34:18 +00:00
Stefano Sabatini
2e01def0fe Define ff_nut_video_tags and make Nut muxer and demuxer set it in
codec_tag.

Originally committed as revision 23259 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-23 18:34:15 +00:00
Reimar Döffinger
944a1b6b96 Add a md5 muxer that allows checking the md5 sums of generated streams without
needing an external MD5 command.

Originally committed as revision 23257 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-23 13:07:33 +00:00
Martin Storsjö
576fb48e6d Make ff_random_get_seed public, rename to av_get_random_seed, export the header
Keep an old ff_ named function for binary compatibility until the
next major bump.

Originally committed as revision 23254 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-23 08:53:40 +00:00
Stefano Sabatini
e1745e2f6e Make av_write_header() return AVERROR(EINVAL) rather than -1 if the
input parameters are not valid.

Originally committed as revision 23253 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-22 21:52:06 +00:00
Stefano Sabatini
cf5b33d9fa Store in a dedicated array the format name - codec id - codec type
mapping. Simplify.

Originally committed as revision 23252 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-22 21:52:02 +00:00
Francesco Lavra
80b39e1ca6 Move AVCodecTag from riff.h into internal.h.
Patch by Francesco Lavra, francescolavra interfree it

Originally committed as revision 23250 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-22 16:01:32 +00:00
Stefano Sabatini
83c2707908 Prefer enum CodecID over int in ff_codec_get_tag().
Originally committed as revision 23249 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-22 15:56:49 +00:00
David Conrad
577abedb39 matroskaenc: Don't write track timecode scale
It's not required for mkv and unsupported in webm

Originally committed as revision 23247 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-22 01:41:38 +00:00
David Conrad
c7b913c8ad matroskadec: Allow unknown EBML doctype
Originally committed as revision 23246 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-22 01:41:35 +00:00