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
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
cc947f04cc
Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY.
...
Patch by Jean-Daniel Dupas, devlists shadowlab org
Originally committed as revision 22744 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-31 12:29:58 +00:00
72415b2adb
Define AVMediaType enum, and use it instead of enum CodecType, which
...
is deprecated and will be dropped at the next major bump.
Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-30 23:30:55 +00:00
a7a85dc4c2
Cast sample_fmt (as read from bitstream as a 16-bit value) to int16, so that
...
negative values, e.g. SAMPLE_FMT_NONE (-1), are read correctly also.
Originally committed as revision 22585 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-17 15:14:18 +00:00
114a93c700
Fix ffm_close return type.
...
Originally committed as revision 22432 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-10 14:26:15 +00:00
2dc22a64b4
Fix memory leak in FFM demuxer
...
Originally committed as revision 22431 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-10 13:17:50 +00:00
8c0c11229e
Fix breakage introduced by setting the sample_fmt to SAMPLE_FMT_NONE (r20623). This makes
...
streaming to ffserver work again.
Originally committed as revision 20869 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-14 21:08:21 +00:00
d2b34efe22
Update ffserver to include all basic x264 parameters in .ffm files.
...
Originally committed as revision 20601 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-24 15:54:17 +00:00
ed54ae08b8
remove useless duplication of what av_new_stream() already does
...
Originally committed as revision 18416 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-10 12:49:53 +00:00
be2a6e2f82
fix compilation when DEBUG_SEEK is defined
...
Originally committed as revision 18099 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-21 07:36:25 +00:00
92a0f33878
fix valid seeking range
...
Originally committed as revision 18098 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-21 07:35:52 +00:00
7c45723a98
resync ffm if error in stream
...
Originally committed as revision 18065 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-20 01:44:45 +00:00
21c6438f2c
typo, fix eof check
...
Originally committed as revision 18064 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-20 01:39:55 +00:00
b9edbe9953
do not write ffm write index by default, detect if file is being written and return EOF
...
Originally committed as revision 18063 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-20 01:23:33 +00:00
2dc9188465
return error if read failed
...
Originally committed as revision 17173 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-12 02:17:16 +00:00
6fcce4f995
Change ffm_write_write_index to return int, and return if error occured.
...
Patch by Patrik Kullman, patrik at yes dot nu
Originally committed as revision 17172 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-12 02:15:07 +00:00
eee99eb3e8
return eof/error if only ffm header has been written, should fix #815
...
Originally committed as revision 16924 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-01 22:02:57 +00:00
406792e7b0
cosmetics: Remove pointless period after copyright statement non-sentences.
...
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-19 15:46:40 +00:00
b250f9c66d
Change semantic of CONFIG_*, HAVE_* and ARCH_*.
...
They are now always defined to either 0 or 1.
Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-13 23:44:16 +00:00
6a5d31ac25
Fix build: Add intreadwrite.h and bswap.h #includes where necessary.
...
Originally committed as revision 16556 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-11 22:19:48 +00:00
bc5c918ea8
Remove offset_t typedef and use int64_t directly instead.
...
The name offset_t is easily confused with the standard off_t type and
*_t is POSIX reserved namespace if any POSIX header is included.
Originally committed as revision 15533 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-03 10:16:29 +00:00
af274fd1e1
Improve long names for FFM muxer and demuxer:
...
change "ffm format" to "FFM (FFserver live feed) format".
Originally committed as revision 14438 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-27 20:59:40 +00:00
fabb990ec2
cosmetics, pts->dts
...
Originally committed as revision 13881 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 08:53:44 +00:00
dbedf2aae2
enable feeder threads
...
Originally committed as revision 13868 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 01:35:43 +00:00
9f5d3b13cf
ffm has no per stream priv_data anymore
...
Originally committed as revision 13832 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-19 22:50:17 +00:00
e785efc49a
Fix compilation with -DDEBUG, patch by Albert Astals Cid, aastals tv-wan es.
...
Originally committed as revision 13727 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-09 08:44:45 +00:00
3c6a9f66b9
pass dts and pts through ffm, should fix streaming b frames
...
Originally committed as revision 13725 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-09 07:43:14 +00:00
7080cbe2c8
pass extradata through ffm
...
Originally committed as revision 13721 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-09 00:36:27 +00:00
2940b38ef2
fix pts handling in ffm
...
Originally committed as revision 13683 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-07 00:49:03 +00:00
c07d64c890
Reset reading state after successful seek.
...
Originally committed as revision 13682 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-07 00:35:37 +00:00
b30bb5357d
cosmetics, rename first to header, more explicit name
...
Originally committed as revision 13677 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-06 20:36:16 +00:00
bde15e74de
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
...
patch by Stefano Sabatini, stefano.sabatini-lala poste.it
along with some spelling/consistency fixes for the long names by me
Originally committed as revision 13649 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-03 16:20:54 +00:00
a077f3bc1a
typo
...
Originally committed as revision 13448 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 23:59:28 +00:00
8999c833d1
replace printf by av_log
...
Originally committed as revision 13425 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 04:40:22 +00:00
a299832f52
use av_hex_dump_log
...
Originally committed as revision 13424 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 04:38:46 +00:00
ff978de47c
use dprintf
...
Originally committed as revision 13423 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 04:34:29 +00:00
eea2f032ad
return error if frame_offset is negative, prevent segfault
...
Originally committed as revision 13420 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 03:53:48 +00:00
e5ece1831a
return error if len is negative, prevent segfault
...
Originally committed as revision 13419 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 03:53:10 +00:00
278f987a33
move ffserver specific functions up and only include unistd.h in this case
...
Originally committed as revision 13418 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 03:52:14 +00:00
a1e01307ad
move ffm_seek1 before get_pts function since func uses it
...
Originally committed as revision 13417 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 03:50:25 +00:00
4adcbbbeef
move DEBUG_SEEK definition before get_pts since func uses it
...
Originally committed as revision 13416 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 03:47:56 +00:00
979b1a0611
move get_pts function to avoid useless declaration
...
Originally committed as revision 13415 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 03:47:07 +00:00
85a6b01da4
split ffm de/muxer
...
Originally committed as revision 13413 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 03:44:31 +00:00
Reimar Döffinger