Michael Niedermayer
9829ec1a9c
ffm: redesign header format to make it extensible
...
Currently FFM files generated with one versions of ffmpeg generally
cannot be read by another.
By spliting data into chunks, more fields can saftely be appended to
chunks as well as new chunks added.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Clément Bœsch
f7c46d251c
ffserver: fix seeking with ?date=...
...
Regression since 5f847bf61d
.
After this commit, timestamps pushed by FFmpeg won't be relative
anymore, but absolute (based on the date/time at the beginning of the
push). This will allow seeking to work properly. Before this patch, the
seek was done, but ffm timestamps were way smallers than the absolute
requested timestamp (based on a date), so the seek was done, but to the
end of the stream (which was similar to no effect at all).
12 years ago
Justin Ruggles
11dcddb97b
ffm: do not write or read the audio sample format
12 years ago
Anton Khirnov
3b4bb19e63
lavf: flush the output AVIOContext in av_write_trailer().
...
This is consistent with stdio and is what we want to do in all cases.
Fixes a bug in the voc muxer which didn't flush in write_trailer()
previously. This is the cause of the change in the test results.
12 years ago
Michael Niedermayer
7e49474aa0
ffmenc: switch to av_assert
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Mans Rullgard
6d3783d160
ffmenc: replace if/abort with assert()
...
The condition is trivially true, but keeping the assert() is
sensible to avoid FFM_HEADER_SIZE ever getting out of sync with
the actual code.
Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years ago
Anton Khirnov
36ef5369ee
Replace all CODEC_ID_* with AV_CODEC_ID_*
13 years ago
Diego Biurrun
6774247a9d
avformat: Drop pointless "format" from container long names
13 years ago
Michael Niedermayer
0354412aa3
ffmenc: use av_assert
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Anton Khirnov
63efd83ae1
mpegvideo_enc: add chroma/luma_elim_threshold private options.
...
Deprecate corresponding AVCodecContext fields.
13 years ago
Anton Khirnov
44bcab5883
ffmenc: remove references to deprecated AVFormatContext.timestamp.
13 years ago
Paul B Mahol
ba10207bbe
Use more designated initializers.
...
Also remove some pointless NULL/0 assigments.
C++ code must be left as it is because named struct
initializers are not supported by C++ standard.
13 years ago
Mans Rullgard
3383a53e7d
lavu: replace int/float punning functions
...
The existing functions defined in intfloat_readwrite.[ch] are
both slow and incorrect (infinities are not handled).
This introduces a new header with fast, inline conversion
functions using direct union punning assuming an IEEE-754
system, an assumption already made throughout the code.
The one use of Intel/Motorola extended 80-bit format is
replaced by simpler code sufficient under the present
constraints (positive normal values).
The old functions are marked deprecated and retained for
compatibility.
Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years ago
Anton Khirnov
c3f9ebf743
lavf: make av_set_pts_info private.
...
It's supposed to be called only from (de)muxers.
13 years ago
Anton Khirnov
9c684feadc
libx264: add 'direct-pred' private option
...
Deprecate AVCodecContext.directpred
13 years ago
Anton Khirnov
0635a8aa21
libx264: add 'partitions' private option
...
Deprecate AVCodecContext.partitions.
13 years ago
Anton Khirnov
4d58e4cb4c
Rename ffserver to avserver.
14 years ago
Anton Khirnov
dfc2c4d900
lavf: use designated initialisers for all (de)muxers.
...
It's more readable and less prone to breakage.
14 years ago
Anton Khirnov
5e8d2e337e
lavf: deprecate AVStream.quality.
...
AVStream is no place for it and it's unused outside of ffmpeg anyway.
14 years ago
Mans Rullgard
ee8aecd23a
Do not include intfloat_readwrite.h in avutil.h
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
14 years ago
Mans Rullgard
2912e87a6c
Replace FFmpeg with Libav in licence headers
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
14 years ago
Anton Khirnov
b7f2fdde74
avio: rename put_flush_packet -> avio_flush
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
384c9c2fa7
avio: add avio_tell macro as a replacement for url_ftell
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit a2704c9712
)
14 years ago
Anton Khirnov
a2704c9712
avio: add avio_tell macro as a replacement for url_ftell
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
e9eb8d0bce
avio: avio: avio_ prefixes for put_* functions
...
In the name of consistency:
put_byte -> avio_w8
put_<type> -> avio_w<type>
put_buffer -> avio_write
put_nbyte will be made private
put_tag will be merged with avio_put_str
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 77eb5504d3
)
14 years ago
Anton Khirnov
77eb5504d3
avio: avio: avio_ prefixes for put_* functions
...
In the name of consistency:
put_byte -> avio_w8
put_<type> -> avio_w<type>
put_buffer -> avio_write
put_nbyte will be made private
put_tag will be merged with avio_put_str
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
471fe57e1a
avio: rename ByteIOContext to AVIOContext.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit ae628ec1fd
)
14 years ago
Anton Khirnov
ae628ec1fd
avio: rename ByteIOContext to AVIOContext.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Diego Elio Pettenò
66355be3c3
Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.
...
This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts.
(cherry picked from commit c6610a216e
)
14 years ago
Diego Elio Pettenò
c6610a216e
Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.
...
This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts.
14 years ago
Anton Khirnov
e910a77b0d
avio: add av_put_str and deprecate put_strz in favor of it
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 4efd5cf34b
)
14 years ago
Anton Khirnov
4efd5cf34b
avio: add av_put_str and deprecate put_strz in favor of it
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
14 years ago
Jean-Daniel Dupas
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
15 years ago
Stefano Sabatini
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
15 years ago
Benjamin Larsson
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
15 years ago
Jason Garrett-Glaser
d2b34efe22
Update ffserver to include all basic x264 parameters in .ffm files.
...
Originally committed as revision 20601 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Baptiste Coudurier
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
16 years ago
Diego Biurrun
406792e7b0
cosmetics: Remove pointless period after copyright statement non-sentences.
...
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago
Diego Biurrun
6a5d31ac25
Fix build: Add intreadwrite.h and bswap.h #includes where necessary.
...
Originally committed as revision 16556 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago
Michael Niedermayer
3cffbe090a
Fix rc_eq mem leak.
...
Originally committed as revision 14788 to svn://svn.ffmpeg.org/ffmpeg/trunk
17 years ago
Stefano Sabatini
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
17 years ago
Stefan Gehrer
6d083dd7e9
fix size of header data
...
Originally committed as revision 14015 to svn://svn.ffmpeg.org/ffmpeg/trunk
17 years ago
Baptiste Coudurier
fabb990ec2
cosmetics, pts->dts
...
Originally committed as revision 13881 to svn://svn.ffmpeg.org/ffmpeg/trunk
17 years ago
Baptiste Coudurier
148c8d8018
store dts in ffm headers
...
Originally committed as revision 13880 to svn://svn.ffmpeg.org/ffmpeg/trunk
17 years ago
Baptiste Coudurier
5e5f75cf8a
remove pts set hack, this is no more correct
...
Originally committed as revision 13879 to svn://svn.ffmpeg.org/ffmpeg/trunk
17 years ago
Baptiste Coudurier
dbedf2aae2
enable feeder threads
...
Originally committed as revision 13868 to svn://svn.ffmpeg.org/ffmpeg/trunk
17 years ago
Baptiste Coudurier
54e5cf132d
do not reset ffm pts, this avoids setting last pts to 0 and screwing up seeking
...
Originally committed as revision 13856 to svn://svn.ffmpeg.org/ffmpeg/trunk
17 years ago
Baptiste Coudurier
83657f9f1c
remove now unneeded vars
...
Originally committed as revision 13726 to svn://svn.ffmpeg.org/ffmpeg/trunk
17 years ago
Baptiste Coudurier
3c6a9f66b9
pass dts and pts through ffm, should fix streaming b frames
...
Originally committed as revision 13725 to svn://svn.ffmpeg.org/ffmpeg/trunk
17 years ago
Baptiste Coudurier
7080cbe2c8
pass extradata through ffm
...
Originally committed as revision 13721 to svn://svn.ffmpeg.org/ffmpeg/trunk
17 years ago