virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
22,880 Commits 37 Branches 400 Tags 465 MiB
af037f8098
Commit Graph

5688 Commits

Author SHA1 Message Date
Ronald S. Bultje
0e59034ed8 Remove forward declarations. 
Originally committed as revision 21020 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-04 19:55:43 +00:00
Mike Melanson
2cf9c7ef9c Add support for these widely-used iTunes metadata fields: Album Artist, 
Grouping, and Lyrics.

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

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

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

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

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

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

This way describes slightly better what it does.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Originally committed as revision 20781 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-08 23:47:45 +00:00
Michael Niedermayer
b68a7679f9 Raise threshold of h263 probe by 1 to avoid misdetection. 
Fixes issue 1588.

Originally committed as revision 20765 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-08 12:34:08 +00:00
Michael Niedermayer
f76eef99a2 Add out commented av_log to debug h263_probe. 
Originally committed as revision 20764 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-08 12:33:00 +00:00
Michael Niedermayer
6de5b62790 Also print the number of invalid packets in the debug output. 
Originally committed as revision 20763 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-08 12:24:41 +00:00
Michael Niedermayer
55f6524789 Flip the comparission direction of vid+audio+priv1 and pspack, it appears to have 
been wrong.
Fixes issue1571.

Originally committed as revision 20762 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-08 12:19:30 +00:00
Jai Menon
4da715cb24 AU : demuxed packet size should be sample size aligned. 
Fixes issue 1593.

Originally committed as revision 20758 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-07 13:55:38 +00:00
Kostya Shishkov
e07c92e4bb cosmetics: insert space between codeword and left parenthesis 
Originally committed as revision 20746 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-06 07:03:46 +00:00
Sergiy
615c287990 Do not send invokes to RTMP server if we are not connected to it. 
Patch by Sergiy (server.connect("gmail.com").selectAddress("piratfm"))

Originally committed as revision 20745 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-06 07:01:37 +00:00
Sean Soria
b593f7fdef Calls to url_fseek should have their return value checked in 
av_seek_frame_binary, just as they do in av_seek_frame_generic.
Otherwise, function may return success even though url_fseek reported
failure.

Patch by Sean Soria, first.last at gmail

Originally committed as revision 20744 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-06 00:03:53 +00:00
Kostya Shishkov
c72406112f cosmetics: reindent after last commit 
Originally committed as revision 20732 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-04 16:52:42 +00:00
Sergiy
6bf22e18d1 Implement RTMP output (publishing FLV stream to RTMP server). 
Patch by Sergiy (piratfm at `do-no-evil-mail`.com)

Originally committed as revision 20731 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-04 16:52:16 +00:00
Sergiy
84a29dc10a Compress headers for output RTMP packets. 
Patch by Sergiy (piratfmGMAIL)

Originally committed as revision 20728 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-04 15:01:58 +00:00
Kostya Shishkov
2784ede40a Remove duplicating variable 
Originally committed as revision 20718 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-03 17:11:48 +00:00
Kostya Shishkov
6a63e83afc 5l trocadero: RTMP channel ID lies in range 3-65599, uint8_t is too small for it 
Originally committed as revision 20717 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-03 16:13:51 +00:00
Sergiy
31da596634 Send connect() and createStream() in RTMP system channel, not video channel. 
Patch by Sergiy (com gmail . piratfm @ mail =)

Originally committed as revision 20716 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-03 15:59:51 +00:00
Sergiy
5e9ad75985 Move "app" string into RTMP protocol context. 
Patch by Sergiy (com.gmail@piratfm)

Originally committed as revision 20715 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-03 15:47:00 +00:00
Sergiy
a352b60594 RTMP packets with one-byte header use previous packet timestamp difference, so 
track timestamp difference as well.
Patch by Sergiy (mail.composeAddress("piratfm","gmail.com"))

Originally committed as revision 20714 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-03 06:40:37 +00:00
Ramiro Polla
7c3c53c851 Update Changelog, documentation, and libavformat minor version number for 
"A format generated by IndigoVision 8000 video server" added in r20681.

Originally committed as revision 20712 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-03 00:27:01 +00:00
Sergiy
9e69ab1864 Add another known RTMP channel ID to enum. 
From patch by Sergiy (mail = piratfm, gmail)

Originally committed as revision 20703 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-02 13:00:28 +00:00
Sergiy
b316991bb6 Move is_input flag into RTMP protocol context. 
Patch by Sergiy (gmail(piratfm))
Thread "[PATCH] rtmp-output"

Originally committed as revision 20702 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-02 12:55:10 +00:00
Baptiste Coudurier
77df894aed print error message when image2 muxer fail to compute frame filename 
Originally committed as revision 20694 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-01 23:10:32 +00:00
Sean Soria
6659b32ab2 Change ret type to int64_t because url_fseek returns int64_t. 
This fixes seeking in files > 2gb.
Patch by Sean Soria, sean dot soria at gmail dot com.

Originally committed as revision 20693 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-01 22:56:44 +00:00
Baptiste Coudurier
66765b5933 use AVFormatContext in av_log, better than AVCodecContext when multiple streams are present 
Originally committed as revision 20689 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-01 20:15:05 +00:00
Kostya Shishkov
817d967d96 Write timestamp deltas, not timestamps, for RTMP packets with partial header 
Originally committed as revision 20686 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-01 16:43:53 +00:00
Kostya Shishkov
e6b244a3b9 Full-header RTMP packets contain real timestamp, others contain timestamp 
difference, so make all read packets store absolute timestamp.
As a consequence, we don't need to track audio/video timestamps separately
any longer in protocol handler.

Originally committed as revision 20685 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-01 16:08:44 +00:00
Kostya Shishkov
b1eb53ab59 Write header for RTMP packets with channel_id >= 64 correctly 
Originally committed as revision 20684 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-01 15:13:23 +00:00
Sergiy
59b6482a04 Read and write extended timestamps for RTMP packets. 
Extracted from patch by Sergiy in thread "[PATCH] rtmp-output"

Originally committed as revision 20683 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-01 15:07:32 +00:00
Kostya Shishkov
1ab21f1980 7l trocadero: reading right into enum variable may cause unwanted effects, use 
intermediate buffer for reading value instead in RTMP protocol handler.

Originally committed as revision 20682 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-01 14:58:17 +00:00
Michael Niedermayer
00b6fa40c3 Support "A format generated by IndigoVision 8000 video server". 
Originally committed as revision 20681 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-01 13:17:10 +00:00
Michael Niedermayer
483aad717e slif aka "SoftLab MPEG-2 I-frames Codec" support. 
Flipping one bit still is popular it seems as a means to create a new codec.
fixes issue1469.

Originally committed as revision 20679 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-01 02:07:46 +00:00
Michael Niedermayer
77ac76a30f Print a warning if the duration is estimated from the bitrate, as this is 
likely not accurate.

Originally committed as revision 20675 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-30 22:08:22 +00:00
Vitor Sessak
cea65433e0 decode qcelp in aiff, implement #1524, patch by Vitor 
Originally committed as revision 20674 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-30 22:01:21 +00:00
Baptiste Coudurier
1bd26e51f3 100l, max value for timescale is UINT16_MAX 
Originally committed as revision 20661 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-29 18:26:51 +00:00
Baptiste Coudurier
729ef3ba62 remove useless mov timescale field 
Originally committed as revision 20652 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-29 02:46:49 +00:00
Baptiste Coudurier
74ccc66099 change track timescale to unsigned int, fix warning 
Originally committed as revision 20651 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-29 02:41:48 +00:00
Baptiste Coudurier
7506e117db track time can be 64bit 
Originally committed as revision 20650 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-29 02:40:27 +00:00
Baptiste Coudurier
7c4b7d0f41 support pcm_f32/64le in mov 
Originally committed as revision 20649 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-29 02:27:08 +00:00
Baptiste Coudurier
ba7c0ece61 cosmetics, reindent after last commit 
Originally committed as revision 20648 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-29 02:04:44 +00:00
Baptiste Coudurier
feaa8d110d support sample rates > INT16_MAX in mov using stsd v2 
Originally committed as revision 20647 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-29 02:03:24 +00:00
Jai Menon
6866dd1237 Fix typo. 
Originally committed as revision 20628 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-27 13:10:56 +00:00
Reimar Döffinger
7c7d3abf3c 10l, pix_fmt should be set by the motionpixels decoder, not by the demuxer. 
This fixes playback when lavf and lavc are less tightly couples as in e.g. MPlayer.

Originally committed as revision 20626 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-26 21:15:06 +00:00
Jason Garrett-Glaser
d2b34efe22 Update ffserver to include all basic x264 parameters in .ffm files. 
Originally committed as revision 20601 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-24 15:54:17 +00:00
Peter Ross
c351524c9e Determine VOC block length when length field is zero, fixes issue1538. 
Originally committed as revision 20596 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-24 07:08:17 +00:00
David Conrad
b9c78bca26 MOV: cprt is another tag used for copyright 
Originally committed as revision 20587 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-23 08:47:47 +00:00
David Conrad
7382902b86 MOV: Add several iTunes metadata tags 
Originally committed as revision 20586 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-23 08:47:44 +00:00
David Conrad
620af1a17a MOV: Fix writing \251wrt metadata (r20453 only fixed the demuxer) 
Originally committed as revision 20585 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-23 08:47:40 +00:00
Baptiste Coudurier
9c5a9e6b48 set mp3 timebase to the lcm of all mp3 sample rates to fix frame duration 
Originally committed as revision 20579 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-22 21:04:18 +00:00
Justin Ruggles
c3988a59ce Add MP4 object type for ALS. 
Originally committed as revision 20578 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-22 18:13:22 +00:00
Kostya Shishkov
87ca1b8f7f When searching for AMF object field value, try to find that object first 
instead of assuming it should occur right at given position.
This helps finding human-readable error descriptions in RTMP server replies.

Originally committed as revision 20575 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-22 09:03:06 +00:00
Kostya Shishkov
fe52395878 Print error when RTMP protocol can't open connection 
Originally committed as revision 20574 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-22 08:42:55 +00:00
Kostya Shishkov
afbacb931b Pass only useful FLV metadata from RTMP stream 
Originally committed as revision 20573 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-22 08:40:55 +00:00
Justin Ruggles
aca857ecd3 Do not write an extra byte in the iTunes 'hdlr' tag. The files on iTMS have an 
extra byte and are not compliant with ISO 14496-12.  This causes some strict
demuxers (notably the MPEG-4 ALS reference software) to fail.  It has been
confirmed that not writing the extra byte will still allow the generated MP4
files to work with QuickTime/iTunes/iPod.

Originally committed as revision 20571 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-22 02:07:10 +00:00
Reimar Döffinger
c7a38887c1 Do D10 AES3 audio conversion in-place instead of using a large on-stack buffer. 
Originally committed as revision 20567 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-20 23:12:55 +00:00
Daniel Verkamp
1b88277bd9 FLV muxer support for Flash screen codec v2 
Originally committed as revision 20564 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-20 20:02:49 +00:00
Daniel Verkamp
0aa6a518ad Add codec id for Flash screen codec v2 and hook it up in FLV demuxer 
Originally committed as revision 20563 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-20 19:16:42 +00:00
Baptiste Coudurier
e26df9ebf1 use AVFormatContext in dprintf 
Originally committed as revision 20554 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-19 21:03:25 +00:00
Diego Biurrun
c173693698 Add functions to return library license and library configuration. 
Originally committed as revision 20547 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-18 17:15:17 +00:00
Baptiste Coudurier
adeb907137 Search relative path according to alias record when opening mov reference files. 
Based on patch by Maksym Veremeyenko, verem at m1stereo dot tv

Originally committed as revision 20539 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-15 03:26:47 +00:00
Luca Abeni
103dfbe2c4 Add some "#if"s to avoid compiling the RTSP code when the RTSP demuxer 
is disabled, and remove a useless "#if CONFIG_SDP_DEMUXER"

Originally committed as revision 20530 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-13 10:19:42 +00:00
Stefano Sabatini
1d8041b36c Split overly long line in doxy. 
Originally committed as revision 20529 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-12 23:05:56 +00:00
Luca Abeni
987131828c Split the sdp_read_packet() function out of rtsp_read_packet(). 
This allows to avoid compiling RTSP code when not needed.

Originally committed as revision 20526 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-12 15:34:17 +00:00
Luca Abeni
1ced9da357 Move some some functions around, so that splitting the SDP code out of 
rtsp_read_packet() is simpler.

Originally committed as revision 20525 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-12 10:31:37 +00:00
Alex Converse
ba278391ba Debug print MP4 objectTypeIndication in hex not decimal as values are listed in 
hex in all official documents.

Originally committed as revision 20523 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-12 02:22:19 +00:00
Diego Biurrun
ca02d8ec97 Add '#undef fprintf' before PRINT macro that uses fprintf. 
Otherwise there may be trouble when fprintf is disabled in favor of av_log.

Originally committed as revision 20515 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-11 21:57:50 +00:00
Alex Converse
5aea268d14 Add a channels field to MPEG4AudioConfig. 
Originally committed as revision 20512 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-11 20:24:23 +00:00
Carl Eugen Hoyos
66ddc150f0 Increase default value for max_analyze_duration, fixes issue 1506, a regression. 
Originally committed as revision 20483 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-09 01:10:55 +00:00
Carl Eugen Hoyos
0f87b77176 Use enum instead of integer types where appropriate. 
Originally committed as revision 20482 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-08 23:48:15 +00:00
Carl Eugen Hoyos
80454494de Use CODEC_ID_NONE instead of 0 for enum CodecID. 
Originally committed as revision 20481 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-08 23:46:32 +00:00
Baptiste Coudurier
609d864611 move code to avoid forward declaration 
Originally committed as revision 20475 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-08 03:27:58 +00:00
Baptiste Coudurier
b3f9f7a333 Let pmt override stream info when encoutered later in the ts file. 
Do not set codec id based on pes start code, this is unreliable.
Fix gazeta-20090408-1456-aa.ts

Originally committed as revision 20474 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-08 03:17:08 +00:00
Carl Eugen Hoyos
28f008a9d3 Support some LATM AAC streams (they can be decoded with MPlayer). 
Originally committed as revision 20472 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-07 23:44:56 +00:00
Justin Ruggles
1a15ab4920 Do not set AVCodecContext.sample_fmt in the TMV and SoX demuxers. 
Originally committed as revision 20471 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-07 22:35:00 +00:00
Baptiste Coudurier
a4cb56aaf4 change \0xa9enc tag metadata name to encoder to match id3v2 
Originally committed as revision 20469 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-06 18:59:25 +00:00
Kostya Shishkov
0d32307dd2 10l: WavPack demuxer forgot to seek back to initial position after block 
contents parsing (for custom sampling rate).

Originally committed as revision 20468 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-06 18:25:45 +00:00
Gordon Irlam
9cad7e2193 Fix a typo in rtp_h264.c:parse_h264_sdp_line(). Patch by Gordon Irlam 
(gordonipub2 AT gordoni DOT com).

This fixes H.264 over RTP when the SDP contains a "framesize:" attribute
(for example, rtsp://video3.americafree.tv/AFTVCartoonsH264250.sdp )

Originally committed as revision 20463 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-05 14:25:37 +00:00
Baptiste Coudurier
bddc2df52e 10l, typo 
Originally committed as revision 20462 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-05 08:53:05 +00:00
Kostya Shishkov
7aa2d42db6 If custom sampling rate is set in WavPack file, parse first block to find 
actual value.

This fixes issue 1518.

Originally committed as revision 20461 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-05 08:14:48 +00:00
Kostya Shishkov
aa926a480f Initialize block_parsed before reading first block header in WavPack demuxer, 
it will be useful later.

Originally committed as revision 20460 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-05 08:10:50 +00:00
Baptiste Coudurier
c2564699bf do not redundantly set stream nb_frames, it's already set in read_stts 
Originally committed as revision 20459 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-05 07:32:50 +00:00
Baptiste Coudurier
e745272196 compute dts shift with ctts value, cslg atom might be missing, fix #419 
Originally committed as revision 20458 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-05 07:30:53 +00:00
Baptiste Coudurier
fedb1eca07 check that duration is set to avoid fpe 
Originally committed as revision 20457 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-05 07:17:10 +00:00
Baptiste Coudurier
507330b9d3 warn if stream timescale is not set and set it to 1 to avoid FPE 
Originally committed as revision 20456 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-05 07:11:54 +00:00
Reynaldo H. Verdejo Pinochet
87e76ae0bd Corrects two typos 
Originally committed as revision 20455 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-05 02:04:21 +00:00
Reynaldo H. Verdejo Pinochet
a8e1cbaf18 Decrement probe score at unsuported bpp 
Originally committed as revision 20454 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-05 01:59:07 +00:00
Baptiste Coudurier
55d2e32a40 fix \0xa9wrt metadata, to composer, fix issue #1501 
Originally committed as revision 20453 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-05 01:40:13 +00:00
Andrew Wason
42022e0362 add yuvs fourcc to raw.c and isom.c, fixes samples/mov/yuvs.mov 
patch by Andrew Wason

Originally committed as revision 20439 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-03 16:17:21 +00:00
Ben Littler
e47ca4f798 map VYUY fourcc to rawcodec 
fixes http://samples.mplayerhq.hu/V-codecs/ATI-VCR12/ATI/y422test.avi

Originally committed as revision 20432 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-02 00:10:10 +00:00
Justin Ruggles
dee34af4d6 Set the sample format for Smacker audio in the decoder rather than in the 
demuxer.

Originally committed as revision 20429 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-01 15:08:49 +00:00
Baptiste Coudurier
050ba6f45e print packet duration when debugging timestamps 
Originally committed as revision 20420 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-30 18:17:16 +00:00
Francesco Lavra
e58992e41f Support demuxing teletext in DVB streams. 
Original patch by Francesco Lavra, francescolavra interfree it

Originally committed as revision 20414 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-29 10:46:16 +00:00
Ben Littler
13547dd11f add 2vuy fourcc to riff.c , fixes samples/V-codecs/2vuy.avi 
Originally committed as revision 20383 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-27 17:37:41 +00:00
Ben Littler
9853bbb21a add some raw codec fourccs, fixes: 
samples/V-codecs/

P422.AVI
UYNV.AVI
UYNY.AVI
V422.AVI
YUNV.AVI

Originally committed as revision 20379 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-27 15:57:28 +00:00
Luca Barbato
7549632bda rtsp_close_streams frees the auth_b64 line already 
Originally committed as revision 20370 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-25 00:41:10 +00:00
Luca Barbato
d243ba30b8 Support 3xx redirection in rtsp 
All the error codes 3xx got managed the same way.
After setup/early play redirection will not be managed
REDIRECT method is yet to be supported (if somebody knows a server implementing
it please contact me)

Originally committed as revision 20369 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-25 00:06:31 +00:00
haim alon
c5898e8623 compute codec bitrate in mov demuxer, patch by haim alon, haim dot alter at gmail dot com 
Originally committed as revision 20368 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-24 20:40:00 +00:00
Luca Barbato
921da21745 Just remove params understood by the demuxer 
This should unbreak certain urls.

Originally committed as revision 20364 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-24 16:53:06 +00:00
Luca Barbato
7541f32edd Suppress ?params in the rtsp uri 
Right now rtsp demuxer receives it's ffmpeg specific params encoded in the url
That made the server receiving requests with the url ending with "?udp",
"?multicast" and "?tcp". That may or may not cause problems to servers with
overly strict or overly simple uri parsers

Patch from Armand Bendanan (name.surnameATfreeDOTfr)

Originally committed as revision 20363 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-24 15:18:21 +00:00
Luca Barbato
224b44957b Use sdp c= line if the rtsp Transport line doesn't have a destination 
Transport:destination in rtsp is optional, c= line in sdp is compulsory

Patch from Armand Bendanan (name.surnameATfreeDOTfr)

Originally committed as revision 20362 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-24 15:10:58 +00:00
Diego Biurrun
76e6e9c330 Remove ancient redir demuxer. 
HTTP supports redirection just fine without it.

Originally committed as revision 20361 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-24 12:44:27 +00:00
Michael Niedermayer
df84d7d9bd Fix infinite loop with size==0 && sample_size!=0 in non interleaved avis. 
Untested, i do not have a sample.

Originally committed as revision 20348 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-22 18:43:08 +00:00
Michael Niedermayer
83a4d356ef Support non interleaved avi files that have 0<size<sample_size. 
(No i do not have a sample its thus also untested)
The new code is also simpler.

Originally committed as revision 20347 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-22 18:32:27 +00:00
Samuli Valo
c671ac40f5 Fixes detection and error reporting of non-existing files in img2.c. 
Patch by Samuli Valo: name surname picturall com

Originally committed as revision 20346 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-22 16:27:01 +00:00
Ramiro Polla
a3faf694a2 Add comment on #endif about condition that triggers it. 
Originally committed as revision 20337 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-21 01:25:39 +00:00
Daniel Verkamp
61ee504517 Seek function for TMV 
Originally committed as revision 20336 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-20 19:27:25 +00:00
Daniel Verkamp
0319ba5e12 Parenthesize correctly in TMV probe 
Originally committed as revision 20335 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-20 19:07:08 +00:00
tralph11@yahoo.com
711e69a730 Improve sofdec dectection to avoid false positives for MP2. 
Patch by tralph11, tralph11 yahoo

Originally committed as revision 20333 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-20 15:27:05 +00:00
Benoit Fouet
08580cb05a Make url_resetbuf() assert on wrong flags passed and make it static on next 
version bump.
See thread: [FFmpeg-devel] & vs. &&
Date: Mon, 12 Oct 2009 14:21:06 +0200

Originally committed as revision 20330 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-20 06:40:01 +00:00
Diego Biurrun
0cd0a22488 Move function that is only used by the MP3 muxer below the corresponding #if. 
This removes the dependency of the MP2 muxer on the id3v2 object file.

Originally committed as revision 20329 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-19 23:22:23 +00:00
Diego Biurrun
ff06d76acd Add '#include "libavutil/intreadwrite.h"', necessary for AV_RB32. 
This fixes the build with demuxers disabled.

Originally committed as revision 20327 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-19 22:36:57 +00:00
Diego Biurrun
cd69fa69c5 The MP2/MP3 muxer uses ff_id3v2_tags, so add the correct object dependency. 
Originally committed as revision 20326 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-19 22:32:32 +00:00
Diego Biurrun
6f571d89c1 Remove some duplicate object dependencies for the RTSP demuxer. 
They are already covered by its dependency on the SDP demuxer.

Originally committed as revision 20324 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-19 22:10:15 +00:00
Diego Biurrun
47e9f6217d Add missing rdt.o dependency for SDP demuxer. 
This fixes the build when the RTSP demuxer is disabled.

Originally committed as revision 20323 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-19 22:03:02 +00:00
Baptiste Coudurier
72017ea1dc check stream index validity in av_program_add_stream_index 
Originally committed as revision 20319 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-19 18:55:27 +00:00
Baptiste Coudurier
8425cecacc request mp3 frame_size to be set in has_codec_parameters, fix issue #1314 
Originally committed as revision 20318 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-19 18:53:32 +00:00
Baptiste Coudurier
f2c061ec0f reindent after commit 
Originally committed as revision 20307 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-19 02:20:08 +00:00
Baptiste Coudurier
7edbcfb79e In dump_format, print streams not associated with any program. 
Fixes issue #1366.

Originally committed as revision 20306 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-19 02:12:10 +00:00
Reynaldo H. Verdejo Pinochet
cbd8a722bb Fix wrong comparison in r20304 
Originally committed as revision 20305 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-19 01:42:05 +00:00
Reynaldo H. Verdejo Pinochet
9cf6bbb993 If missing, calculate width or height from bpp and 
image size lowering the probe score too.

Originally committed as revision 20304 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-18 23:56:00 +00:00
Baptiste Coudurier
c3a58c4efc fix indentation 
Originally committed as revision 20300 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-18 23:27:23 +00:00
Carl Eugen Hoyos
94ec3aca56 Support FourCC mjpa as MJPEG. 
Fixes issue 1492.

Originally committed as revision 20296 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-18 22:43:19 +00:00
Baptiste Coudurier
807e4e81a8 mux all stream types except audio as one pes packet per avpacket, issue #1374 
Originally committed as revision 20292 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-18 21:41:03 +00:00
Baptiste Coudurier
7857d3ccf6 fix indentation and add braces 
Originally committed as revision 20289 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-18 20:25:48 +00:00
Baptiste Coudurier
45a49840f3 handle_packets takes number of packets as arg, avoid reading too much 
Originally committed as revision 20288 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-18 20:11:32 +00:00
Baptiste Coudurier
1303d62d84 Increase max resync size, fix demuxing of dvgrab-2009.03.28_19-07-22.m2t 
Print error when max resync size is reached and return EAGAIN instead of
INVALIDDATA, so user can retry if wanted.

Originally committed as revision 20286 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-18 20:08:13 +00:00
Reynaldo H. Verdejo Pinochet
f122ef36b1 Smarten mtv's probe a bit. Check for non zero 
on bpp and width|height header fields. This
change is among the ones suggested by Vitor
Sessak in his '[FFmpeg-devel] [PATCH] Improve
MTV probe' thread.

Originally committed as revision 20283 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-18 18:02:12 +00:00
Aurelien Jacobs
8da1d52cc1 remove old and useless debug code 
It uses the old, deprecated metadata API and prints exactly the same thing
as what ffmpeg/ffplay does.

Originally committed as revision 20280 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-18 16:13:29 +00:00
Anton Khirnov
c4d438c265 Read metadata in WavPack files. 
Patch by Anton Khirnov (acronym("What You Should Know About Something"), gmail)

Originally committed as revision 20279 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-18 15:28:53 +00:00
Anton Khirnov
2bd0758efa matroskaenc: Add support for writing chapters. 
patch by Anton Khirnov  wyskas _at_ gmail _dot_ com

Originally committed as revision 20277 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-18 12:17:01 +00:00
Diego Biurrun
15674f12be cosmetics: Break overly long lines. 
Originally committed as revision 20276 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-18 10:47:40 +00:00
Kostya Shishkov
5d660598b0 Support more than 64 channels in RTMP input 
Originally committed as revision 20270 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-18 07:01:06 +00:00
Kostya Shishkov
8f648b74c3 Accept RTMP packets with one-byte header 
Originally committed as revision 20269 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-18 06:58:00 +00:00
Kostya Shishkov
f836fa1706 Last parameter in RTMP "play" call was optional and some servers seem not to 
understand it, so drop it.

Originally committed as revision 20268 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-18 06:54:04 +00:00
Justin Ruggles
961057decd Remove unnecessary entries in ff_vorbiscomment_metadata_conv. VorbisComment 
keys are case-insensitive.

Originally committed as revision 20267 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-17 21:30:50 +00:00
Vitor Sessak
a4cb675124 Avoid segfault for empty input files 
Originally committed as revision 20265 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-17 20:37:58 +00:00
Måns Rullgård
cf671d0543 Remove extraneous const keyword 
Originally committed as revision 20263 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-17 14:07:28 +00:00
Luca Abeni
56e6f8309e Emit the SDP lines in the correct order 
Originally committed as revision 20262 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-17 11:15:45 +00:00
Carl Eugen Hoyos
bc2d2a07d5 Make AVCodecTag.id enum CodecID and use CODEC_ID_NONE instead of 0. 
Originally committed as revision 20250 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-16 14:46:06 +00:00
Justin Ruggles
68677dd8ed Log a clearer warning message when muxing FLV with Speex containing more than 
8 frames per packet.

Originally committed as revision 20247 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-16 10:04:35 +00:00
Reimar Döffinger
c76911bd65 Split parts of dvdata.h into dvdata.c, this ensures that things like 
work_chunks_* and dv_idct_factor_* variables appear only once in the binary
instead of 3 times.
Saves 3264 bytes in .rodata and 312416 bytes in .bss on x86_64.

Originally committed as revision 20246 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-16 07:55:57 +00:00
Justin Ruggles
046c400103 Add Speex support to the FLV muxer. 
Originally committed as revision 20245 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-16 03:02:25 +00:00
Jai Menon
2e3ca1ffd0 Skip padding bytes correctly in ID3 tags. 
This fixes a regression introduced in r20170.

Originally committed as revision 20238 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-15 13:55:19 +00:00
Justin Ruggles
0fa0fa296a 10l: update Makefile after rename 
Originally committed as revision 20236 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-15 09:49:06 +00:00
Justin Ruggles
5855e4e0dd Rename aiff.c to aiffdec.c 
Originally committed as revision 20235 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-15 09:46:56 +00:00
Justin Ruggles
47b47bbdaf Split up the AIFF muxer and demuxer into separate files. 
Originally committed as revision 20234 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-15 09:45:16 +00:00
Reimar Döffinger
d8b35b8586 Add decoder for "forward uncompressed". 
Fixes issue 1467.

Originally committed as revision 20226 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-13 18:15:57 +00:00
Reimar Döffinger
1e69999334 MXF: simply ignore tracks that are invalid due to not having a valid Sequence 
part instead of failing completely.
This partly fixes issue 1470 (broken files created by BBC ingex recorder).

Originally committed as revision 20221 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-13 08:08:10 +00:00
Justin Ruggles
8746296818 Add Speex support to the Ogg muxer. 
Originally committed as revision 20220 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-13 01:46:19 +00:00
Justin Ruggles
24c6f152c4 Do not read data past the end of the SSND chunk in the AIFF demuxer. 
Fixes Issue 1455.

Originally committed as revision 20219 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-13 00:19:34 +00:00
Carl Eugen Hoyos
dd9d5a1ef8 Support Midvid JPEG Video Codec (still flipped). 
Originally committed as revision 20218 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-12 22:00:14 +00:00
Carl Eugen Hoyos
54089ecd5a Support Intel JPEG Library Video Codec (still flipped). 
Originally committed as revision 20217 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-12 21:35:26 +00:00
Justin Ruggles
15299b3821 Calculate correct packet durations when demuxing Ogg/Speex. This involves 
determining if there is any delay in the first packet and/or any truncation in
the final packet.

Originally committed as revision 20216 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-12 21:30:03 +00:00
Reimar Döffinger
90aa6ace63 Merge declaration and initialization 
Originally committed as revision 20214 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-12 16:38:08 +00:00
Reimar Döffinger
098d8e0950 Simplify: use FFMIN 
Originally committed as revision 20213 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-12 16:36:48 +00:00
Daniel G. Taylor
febd1c90a6 Detect Windows Media DRM protected files and display warning if no key 
was provided.

Patch by Daniel G. Taylor, dan programmer-art org

Originally committed as revision 20209 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-11 23:09:33 +00:00
Carl Eugen Hoyos
b8c0db9981 Allow autodetection of E-AC3. 
Originally committed as revision 20206 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-11 11:56:53 +00:00
Carl Eugen Hoyos
0096d766b9 Allow demuxing of E-AC3 (stream type 0x84) in MPEG-TS. 
Originally committed as revision 20200 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-10 21:17:52 +00:00
Daniel Verkamp
54eb4ae0a2 Do not allow 0 sample rate in TMV demuxer 
Originally committed as revision 20195 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-09 18:29:19 +00:00
Daniel Verkamp
f19ae9ea4d Stricter TMV probe 
Originally committed as revision 20194 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-09 18:24:47 +00:00
Daniel Verkamp
70d8c762d9 Reindent 
Originally committed as revision 20182 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-06 17:51:28 +00:00
Daniel Verkamp
811e0fc2e8 Add RF64 support to wav demuxer. 
Originally committed as revision 20181 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-06 17:50:10 +00:00
Anton Khirnov
7fd5aeb3e5 Only read ID3v1 tag if ID3v2 isn't present or is empty. 
This prevents the demuxer from exporting multiple semantically identical but
differently named tags.

Patch by Anton Khirnov, wyskas gmail

Originally committed as revision 20175 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-05 21:36:56 +00:00
Anton Khirnov
41770abf86 id3v2: Export all text information frames with correct names. 
Patch by Anton Khirnov <wyskas at gmail dot com>

Originally committed as revision 20171 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-05 20:10:07 +00:00
Anton Khirnov
078d89a2b0 MP3 muxer: Write all metadata. 
Patch by Anton Khirnov <wyskas at gmail dot com>

Originally committed as revision 20170 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-05 16:06:00 +00:00
Daniel Verkamp
79c0790789 Fix pcm_read_seek () when the position it calculates is greater than 2 GB. 
pcm_read_seek() puts the return value of url_fseek() in an int and then
compares < 0 to see if an error occurred; if the position is greater
than 2 GB, the 32-bit signed int result will be < 0.

Change the type of ret to int64_t to avoid the wraparound.

patch by Daniel Verkamp, daniel drv nu

Originally committed as revision 20169 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-05 09:19:42 +00:00
Ian Caulfield
63380b5e54 Allow the combined TrueHD/AC3 tracks on Blu-Ray discs to be demuxed as two separate streams. 
Patch by Ian Caulfield, ian D caulfield A gmail

Originally committed as revision 20168 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-05 08:38:39 +00:00
Carl Eugen Hoyos
e18027ac40 Add FIXME about low_delay vs has_b_frames. 
Originally committed as revision 20161 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-03 19:40:52 +00:00
Wallak
f4a4be3f4e H264 allows B frames without requiring a >=1 sized buffer. 
Patch by wallak, wallak free fr

Originally committed as revision 20160 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-03 19:30:09 +00:00
Reimar Döffinger
3fcb5113c6 wav demuxer: return AVERROR_EOF instead of AVERROR(EIO) when the end of 
the file is reached normally, without any error.

Originally committed as revision 20143 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-02 07:27:08 +00:00
Reimar Döffinger
e581b6288f wav: return av_get_packet errors unchanged. 
Originally committed as revision 20142 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-02 07:22:44 +00:00
Reimar Döffinger
fbc6630168 Remove url_feof check that would be triggered only after incorrectly producing 
an empty packet and also av_get_packet already handles EOF now.

Originally committed as revision 20140 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-02 07:05:52 +00:00
Reimar Döffinger
8a62a378de Remove useless setting of pkt->size, av_get_packet already handles that. 
Originally committed as revision 20139 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-02 07:03:04 +00:00
Reimar Döffinger
a7a9dd0eb6 Return special EOF checking for aiff and au demuxers, the check was at 
the wrong place, causing an empty packet to be read before EOF was
detected and the eof detection is already now handled by av_get_packet anyway.

Originally committed as revision 20138 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-02 06:42:20 +00:00
Reimar Döffinger
c3db0bc61d Return any error return values from av_get_packet, get_buffer etc. unchanged 
in the raw demuxers.
Also remove special handling of 0-size reads, if they are due to an error/eof,
these are already converted to the appropriate error by get_buffer.

Originally committed as revision 20137 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-02 06:40:50 +00:00
Reimar Döffinger
7f7686dfb1 Make get_buffer and get_partial_buffer return url_ferror or AVERROR_EOF as 
appropriate if it couldn't read any data at all.
This should make handling of EOF and error simpler or make it work right without
extra code in a few place (e.g. raw demuxer).

Originally committed as revision 20135 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-02 06:36:39 +00:00
Aurelien Jacobs
553e9f7529 matroskadec: cosmetics: indentation 
Originally committed as revision 20133 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-01 21:15:36 +00:00
Aurelien Jacobs
ff0d5a745e matroskadec: don't overwrite extradata already read by ff_get_wav_header() 
Originally committed as revision 20132 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-01 21:14:46 +00:00
Aurelien Jacobs
038146e9cf matroskadec: fix handling of A_MS/ACM track with no extradata 
Originally committed as revision 20131 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-01 21:14:05 +00:00
Reimar Döffinger
22a7e19b50 Make rawvideo_read_packet return partial frames. 
This is consistent with other demuxers and also fixes a memleak (memory
allocated for partial frame data was leaked).

Originally committed as revision 20130 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-01 17:32:22 +00:00
Reimar Döffinger
8cb724c5c4 Simplify: remove pointless {} and else 
Originally committed as revision 20129 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-01 17:26:20 +00:00
Reimar Döffinger
d4c1803e0e Remove pointless setting of pkt->size, av_get_packet already handles this. 
Originally committed as revision 20128 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-01 17:22:01 +00:00
Reimar Döffinger
b46c98bf66 au demuxer: pass av_get_packet error on unchanged instead of converting to 
AVERROR(EIO).

Originally committed as revision 20127 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-01 17:08:33 +00:00
Reimar Döffinger
c67031e7cf av_new_packet failing should return ENOMEM, not EIO. 
Originally committed as revision 20126 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-01 16:10:09 +00:00
Reimar Döffinger
43d7c6118d put_bits can only reliably write up to 31 bit bits, above it relies on 
undefined shift behaviour.
Document this, fix the assert and add a put_bits32 to handle writing 32
bits and use that where necessary.

Originally committed as revision 20124 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-01 15:40:29 +00:00