har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,771 Commits 2 Branches 401 Tags
Commit Graph

6207 Commits

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