virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity
26,187 Commits 37 Branches 400 Tags 467 MiB
62784e3733
Commit Graph

6508 Commits

Author SHA1 Message Date
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