generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
24,863 Commits 24 Branches 241 Tags 173 MiB
513d567152
Commit Graph

6226 Commits

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