generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
17,509 Commits 24 Branches 241 Tags
Commit Graph

4296 Commits

Author SHA1 Message Date
Michael Niedermayer
47146dfbf6 Generic metadata API. 
avi is updated as example.
No version bump, the API still might change slightly ...
No update to ffmpeg.c as requested by aurel.

Originally committed as revision 16424 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-04 18:48:37 +00:00
Yoav Steinberg
853a97530e If we find a VBR tag at the beginning of the file don't attempt to 
parse it as a valid frame.
patch by (Yoav Steinberg yoav out monfort in co in il)

Originally committed as revision 16421 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-04 16:23:18 +00:00
Stefano Sabatini
1ca9133fb4 Drop the deprecated parse_image_size() and parse_frame_rate() functions 
at the next libavformat major version bump.

Originally committed as revision 16420 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-04 11:04:02 +00:00
Michael Niedermayer
ce0453aac9 10l set AVPacket.size to the true size of the returned data instead of 
the (larger) allocated size. (prevents segfaults due to later failures
from 900MB-sized packets, yes fuzzed file not a valid one)

Originally committed as revision 16404 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-31 02:47:54 +00:00
Michael Niedermayer
188e67eaf4 Fix indention which was off by 1 space. 
Originally committed as revision 16403 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-31 01:54:54 +00:00
Michael Niedermayer
0b4ff0c9ef Replace buffer by AVPacket and avoid a memcpy() for video when the number 
of allocated slices matches the actual.
Audio still does a copy (marked with FIXME in the code so this is not missed).

Originally committed as revision 16402 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-31 01:53:12 +00:00
Michael Niedermayer
fce48f5b0b Merge videobuf and audiobuf. 
Originally committed as revision 16401 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-31 00:24:54 +00:00
Michael Niedermayer
f48d545736 Simplify the top of rm_assemble_video_frame(). 
Originally committed as revision 16400 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-30 21:23:02 +00:00
Michael Niedermayer
e45673cb3a Add a few error checks to rm_assemble_video_frame() 
Originally committed as revision 16399 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-30 20:51:18 +00:00
Michael Niedermayer
51d6852f43 All non zero returns of rm_assemble_video_frame() are errors, check things 
accordingly.

Originally committed as revision 16398 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-30 19:49:27 +00:00
Reimar Döffinger
7d204e67e8 av_free() -> av_freep(), patch by Reimar Doffinger, see discussion in 
"rmdec.c: double free" thread on mailinglist.

Originally committed as revision 16379 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-28 23:25:17 +00:00
Ronald S. Bultje
c49a3ec30a Fix double free which happens for playback of .rm files after r16365. See 
"rmdec.c: double free" discussion on mailinglist, patch with suggestions
from Reimar Doffinger.

Originally committed as revision 16378 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-28 23:23:59 +00:00
Kostya Shishkov
5b3658f73b Fix a typo that made VMD demuxer always assume Indeo 3 as video codec. 
Spotted by Robert Swain

Originally committed as revision 16371 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-28 16:22:42 +00:00
Ronald S. Bultje
ade8fb4d75 Reindent after r16368. 
Originally committed as revision 16369 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-28 05:59:11 +00:00
Ronald S. Bultje
a9f84821c5 Add audio_pkt_cnt return value to ff_rm_retrieve_cache(). See discussion in 
"[PATCH] oops I broke rdt.c" mailinglist thread.

Originally committed as revision 16368 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-28 05:58:23 +00:00
Ronald S. Bultje
5d88c2647d Change audio_pkt_cnt from an array into a single field, since only a single 
member of the array is ever used (compare to RMDemuxContext->audio_pkt_cnt).
See "[PATCH] oops I broke rdt.c" mailinglist thread.

Originally committed as revision 16367 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-28 05:55:09 +00:00
Ronald S. Bultje
886e89d0d0 Add RMStream object as function argument to public functions so that non-.rm 
AVStreams can be used to call these public rmdec.c functions as well, as is
the case for RDT/RTSP streams. See mailinglist discussion in "[PATCH] rdt.c:
don't reuse the same AVStream in both RTSP and RM demuxer" thread.

Originally committed as revision 16366 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-28 00:21:11 +00:00
Ronald S. Bultje
ba61472911 Implement RMStream stream-specific private data object in the RM demuxer. 
This allows multiple video or audio streams per .rm file. See mailinglist
thread "[PATCH] rmdec.c: implement RMVideo/AudioStream".

Originally committed as revision 16365 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-28 00:18:38 +00:00
Kostya Shishkov
10f35ebddd Latest Coktel Vision VMDs contained Indeo 3, add demuxer support for it 
Originally committed as revision 16363 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-27 17:34:00 +00:00
Ben Littler
c26436ec46 add amr in avi riff tags 
Originally committed as revision 16303 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-24 02:20:07 +00:00
Carl Eugen Hoyos
9f2ace74ef Fix two identical warnings when compiling riff.c and nuv.c with icc: 
warning #188: enumerated type mixed with another type

Originally committed as revision 16281 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-22 22:12:44 +00:00
Carl Eugen Hoyos
1c53290b67 Fix a warning when compiling with icc: 
warning #188: enumerated type mixed with another type

Originally committed as revision 16280 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-22 22:10:07 +00:00
Aurelien Jacobs
9daa4ceaa3 Initialize s->opaque before calling url_resetbuf(). 
Fixes a regression test crash for icc 10.1 64 bit.

Patch by Aurelien.

Originally committed as revision 16271 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-22 11:23:00 +00:00
Michael Niedermayer
c96bd21227 Change mpeg audio parser so it only sets frame_size, channels and bit_rate 
after it has a few valid frames.
Fixes issue762

Originally committed as revision 16259 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-21 23:50:16 +00:00
Michael Niedermayer
2f3d7ea974 Fix detection of audio codec in K70707-ARIA229.flv. 
Fixes issue760.

Originally committed as revision 16254 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-21 20:56:30 +00:00
Alexander Strange
1ca610c015 Allocate and clear FF_INPUT_BUFFER_PADDING_SIZE bytes at the end of mkv 
extradata.

Fixes valgrind invalid read warnings during H.264 extradata parsing.

Originally committed as revision 16229 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-19 01:00:44 +00:00
Baptiste Coudurier
364df7b7b9 cosmetics, remove useless parenthesis and whitespaces 
Originally committed as revision 16213 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-18 09:18:43 +00:00
Baptiste Coudurier
a15328249d set alac channels from extradata, fix alac mono in m4a 
Originally committed as revision 16212 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-18 09:17:19 +00:00
Ronald S. Bultje
1d217cdb3f Make asf_get_packet() and asf_parse_packet() public for use in RTSP-MS and 
give them a ff_ prefix. See "[PATCH] asf.c: make functions of interest for
MS-RTSP public" thread on ML.

Originally committed as revision 16205 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-18 01:28:29 +00:00
Ronald S. Bultje
d7fb5a18fc Add a ByteIOContext argument to ASF functions that will be shared with the 
RTSP stack for RTSP-MS support. This way, they can read input from any given
input source. See discussion in "[PATCH] add gb argument to ASF functions of
interest to MS-RTSP" ML thread.

Originally committed as revision 16204 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-18 01:25:43 +00:00
Benoit Fouet
8b2386dc5a Add jp2 support to img2 demuxer. 
On behalf of Jai Menon

Originally committed as revision 16187 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-17 11:22:51 +00:00
Baptiste Coudurier
18cb36fd57 activate jpeg2000 fourcc in mov/mj2 
Originally committed as revision 16185 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-17 08:09:09 +00:00
Michael Niedermayer
ca5b528ea1 Fix bug where the avi demxuer lost the first frame of malformed 
ODML avis.
Fixes VS2k5DebugDemo-01-partial.avi

Originally committed as revision 16167 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-16 16:14:07 +00:00
Baptiste Coudurier
271344377a check that nb_streams is valid before setting stream, fix crash with jp2 which do not use same structure 
Originally committed as revision 16166 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-16 08:47:28 +00:00
Ben Littler
f86cd76138 add MPNG fourcc 
fixes http://sceneish.ath.cx/stuff/netmap/netmap.avi

Originally committed as revision 16163 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-16 05:22:53 +00:00
Ben Littler
4a49a5fdfc two more mpeg4 fourccs and one msmpeg4v3 from uncommon codec list 
Originally committed as revision 16162 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-16 05:20:11 +00:00
Ben Littler
a9cf309b96 QIVG fourcc, fixes http://rodweb.dip.jp/partner/check.avi 
Originally committed as revision 16161 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-16 03:49:26 +00:00
Ben Littler
c6340f86a3 add rpza avi fourcc 
Originally committed as revision 16160 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-16 03:42:10 +00:00
Ronald S. Bultje
b9b2b8c93b Use get_buffer() and url_fskip() for some loops of get_byte()s. See discussion in ML thread 
"[PATCH] rmdec.c: use get_buffer and skip_bytes instead of loops of get_byte".

Originally committed as revision 16139 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-14 22:26:28 +00:00
Ronald S. Bultje
127ed7b07b Reindent something that looks weird. 
Originally committed as revision 16138 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-14 22:24:58 +00:00
Ronald S. Bultje
b965ff352f Add comment to indicate why the SDP line buffer is as big as it is. 
Originally committed as revision 16137 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-14 22:23:59 +00:00
Ronald S. Bultje
e322d3f5be Increase SDP line buffer size because ASF headers in RTSP-MS are very big. See ML discussion 
in "rtsp.c: increase SDP line buffer size" thread.

Originally committed as revision 16136 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-14 22:23:14 +00:00
Michael Niedermayer
a3bb564ee5 10l (forgot sample_size) 
Should fix fate.

Originally committed as revision 16133 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-14 20:38:05 +00:00
Stefano Sabatini
7a961a46ba Make register_avcodec() call avcodec_init(). 
This avoids the possibility to use a registered codec without first
initializing libavcodec, which resulted in unexpected behavior.

Originally committed as revision 16131 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-14 20:04:00 +00:00
Måns Rullgård
eedfe2227a oggflac: fix bitstream reader usage 
Originally committed as revision 16129 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-14 17:30:18 +00:00
Michael Niedermayer
25983dcd53 Fix non interleaved variable fps ODML avis. 
Fixed issue738

Originally committed as revision 16127 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-14 15:48:48 +00:00
Michael Niedermayer
492322fccc Remove silly FIXME comment. 
Originally committed as revision 16122 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-14 14:01:12 +00:00
Mike Melanson
02fb2546e8 The POSIX namespace shall be held sacrosanct. To that end, 
continue eliminating _t from structure names in FFmpeg.

Originally committed as revision 16118 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-14 03:29:33 +00:00
Luca Abeni
be73a544af Rename rtp_payload_data_t to avoid clashes with the POSIX namespace 
Originally committed as revision 16115 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-13 23:25:19 +00:00
Luca Abeni
1afe09d515 Remove useless typedef 
Originally committed as revision 16114 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-13 23:20:05 +00:00