976a8b2179
Merge remote-tracking branch 'qatar/master'
...
* qatar/master: (40 commits)
H.264: template left MB handling
H.264: faster fill_decode_caches
H.264: faster write_back_*
H.264: faster fill_filter_caches
H.264: make filter_mb_fast support the case of unavailable top mb
Do not include log.h in avutil.h
Do not include pixfmt.h in avutil.h
Do not include rational.h in avutil.h
Do not include mathematics.h in avutil.h
Do not include intfloat_readwrite.h in avutil.h
Remove return statements following infinite loops without break
RTSP: Doxygen comment cleanup
doxygen: Escape '\' in Doxygen documentation.
md5: cosmetics
md5: use AV_WL32 to write result
md5: add fate test
md5: include correct headers
md5: fix test program
doxygen: Drop array size declarations from Doxygen parameter names.
doxygen: Fix parameter names to match the function prototypes.
...
Conflicts:
libavcodec/x86/dsputil_mmx.c
libavformat/flvenc.c
libavformat/oggenc.c
libavformat/wtv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2011-07-04 00:45:21 +02:00
ee8aecd23a
Do not include intfloat_readwrite.h in avutil.h
...
Signed-off-by: Mans Rullgard <mans@mansr.com >
2011-07-03 21:42:06 +01:00
f9ecb849ef
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
crypto: Use av_freep instead of av_free
lavf: don't try to free private options if priv_data is NULL.
swscale: fix types of assembly arguments.
swscale: move two macros that are only used once into caller.
swscale: remove unused function.
options: Add missing braces around struct initializer.
mov: Remove leftover crufty debug statement with references to a local file.
dvbsubdec: Fix compilation of debug code.
Remove all uses of now deprecated metadata functions.
Move metadata API from lavf to lavu.
Conflicts:
doc/APIchanges
libavformat/aiffdec.c
libavformat/asfdec.c
libavformat/avformat.h
libavformat/avidec.c
libavformat/cafdec.c
libavformat/matroskaenc.c
libavformat/mov.c
libavformat/mp3enc.c
libavformat/wtv.c
libavutil/avutil.h
libavutil/internal.h
libswscale/swscale.c
libswscale/x86/swscale_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2011-06-09 04:47:19 +02:00
d2d67e424f
Remove all uses of now deprecated metadata functions.
2011-06-08 07:43:45 +02:00
174df6affc
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
build: remove empty $(OBJS) target
build: make rule for linking ff* apply only to these targets
build: rearrange some lines in a more logical way
s302m: fix resampling for 16 and 24bits.
ARM: remove MUL64 and MAC64 inline asm
build: clean up .PHONY lists
build: move all (un)install* target aliases to toplevel Makefile
flvenc: propagate error properly
build: remove stale dependency
build: do not add CFLAGS-yes to CFLAGS
utils.c: fix crash with threading enabled.
configure: simplify source_path setup
configure: remove --source-path option
lavf: deprecate AVFormatParameters.time_base.
img2: add framerate private option.
img2: add video_size private option.
img2: add pixel_format private option.
tty: add framerate private option.
Conflicts:
Makefile
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2011-06-07 03:37:57 +02:00
0e28e9ca8f
flvenc: propagate error properly
...
avio_flush can fail, in particular when used with the rtmp/librtmp
protocol.
2011-06-06 10:53:19 -05:00
c22f2527ed
In mov and flv muxer, check aac bitstream validity.
2011-04-18 14:30:14 -07:00
2912e87a6c
Replace FFmpeg with Libav in licence headers
...
Signed-off-by: Mans Rullgard <mans@mansr.com >
2011-03-19 13:33:20 +00:00
b7f2fdde74
avio: rename put_flush_packet -> avio_flush
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com >
2011-03-16 22:59:39 -04:00
45a8a02a41
lavf: replace avio_seek(SEEK_CUR) with avio_skip where it makes sense
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com >
2011-03-16 22:24:51 -04:00
a2704c9712
avio: add avio_tell macro as a replacement for url_ftell
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com >
2011-03-04 11:26:57 -05:00
6b4aa5dac8
avio: avio_ prefix for url_fseek
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com >
2011-03-01 12:12:33 -05:00
bbc413f943
lavf: replace remaining uses of put_tag with avio_write
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com >
2011-02-25 14:38:56 -05:00
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 >
2011-02-21 14:25:15 -05:00
ae628ec1fd
avio: rename ByteIOContext to AVIOContext.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com >
2011-02-20 08:37:15 -05:00
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.
2011-01-26 22:10:09 +00:00
b9f9e59afc
Replace deprecated CODEC_TYPE_AUDIO and CODEC_TYPE_VIDEO with the
...
corresponding AVMEDIA_TYPE_* symbols.
Originally committed as revision 25201 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-25 23:27:16 +00:00
16f825085a
FLV Metadata
...
Patch by Tomás Touceda, chiiph gentoo org
Originally committed as revision 25101 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-10 23:29:07 +00:00
df4f1d5108
Add AVC EOS tag to H264-encoded FLV files.
...
Patch by Thierry Foucu, tfoucu gmail
Originally committed as revision 24820 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-18 09:39:21 +00:00
80b39e1ca6
Move AVCodecTag from riff.h into internal.h.
...
Patch by Francesco Lavra, francescolavra interfree it
Originally committed as revision 23250 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-22 16:01:32 +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
c5e1e9827d
Guess the duration before converting video and write guessed duration
...
into flv header.
Patch by Justin Johnson, justin D johnson3 A gmail
Originally committed as revision 21615 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-02 22:23:09 +00:00
8e9efe4392
FLV 8-bit PCM is unsigned, not signed
...
Fixes issue #1569
Originally committed as revision 20853 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-14 03:30:25 +00:00
1b88277bd9
FLV muxer support for Flash screen codec v2
...
Originally committed as revision 20564 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-20 20:02:49 +00:00
68677dd8ed
Log a clearer warning message when muxing FLV with Speex containing more than
...
8 frames per packet.
Originally committed as revision 20247 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-16 10:04:35 +00:00
046c400103
Add Speex support to the FLV muxer.
...
Originally committed as revision 20245 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-16 03:02:25 +00:00
e458dd0be0
Flv should be AVFMT_VARIABLE_FPS.
...
Originally committed as revision 19873 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-16 01:49:34 +00:00
3f3f3ba799
Fix onMetaData property count in flv files (issue 1206).
...
Patch by Yoshihisa Uchida, yoshihisa D uchida A gmail
Originally committed as revision 19236 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-20 12:52:48 +00:00
426a6f34a0
Splits the totalbitrate in a videodatarate and audiodatarate part.
...
Patch by Stefan de Konink stefan konink de
Originally committed as revision 16944 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 16:10:46 +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
71e685b018
use ff_avc_parse_nal_units_buf because output size might differ from input size
...
Originally committed as revision 16626 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-16 01:22:30 +00:00
ca93bc175a
Reindent after last commit
...
Originally committed as revision 16617 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-15 14:07:59 +00:00
0a63a676ec
Do not reallocate AVPacket's data when muxing a packet
...
Originally committed as revision 16616 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-15 14:03:07 +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
fd7f59639c
remove comment, this is not relevant anymore
...
Originally committed as revision 16528 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-11 05:24:41 +00:00
2ba0470e81
reindent
...
Originally committed as revision 16527 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-11 05:23:46 +00:00
7d637efa80
check for negative dts value even if bitstream is already formated,
...
this fixes dts when stream copying.
Originally committed as revision 16526 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-11 05:23:10 +00:00
8ddd280d2d
Nellymoser 8KHZ flv muxing fix, patch by Alexander Wichers development at wichersdot nu
...
Originally committed as revision 15633 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-18 12:10:08 +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
dd1c8f3e6e
Bump Major version, this commit is almost just renaming bits_per_sample to
...
bits_per_coded_sample but that cannot be done seperately.
Patch by Luca Abeni
Also reset the minor version and fix the forgotton change to libfaad.
Note: The API/ABI should not be considered stable yet, there still may
be a change done here or there if some developer has some cleanup ideas and
patches!
Originally committed as revision 15262 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-08 14:24:59 +00:00
b83a00b8b6
timestamps in flv are 32bits _signed_ according to flash player, specs are wrong
...
Originally committed as revision 15045 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 03:07:31 +00:00
6f4eb12d31
remove now useless casts
...
Originally committed as revision 15044 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 03:01:59 +00:00
c18545929e
Change codec_tag type from const struct AVCodecTag ** to const struct AVCodecTag * const *
...
Originally committed as revision 14947 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 16:51:50 +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
c2acba13a4
check if extradata comes from mp4 and assume bitsteam is already formated, should fix streamcopy
...
Originally committed as revision 13516 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-29 00:35:23 +00:00
f23496b562
aac and h264 in flv muxing
...
Originally committed as revision 13438 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 22:00:35 +00:00
a9ee86e79b
set correct duration when using b frames
...
Originally committed as revision 13372 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-25 01:22:06 +00:00
5366f15d05
simplify, remove useless vars
...
Originally committed as revision 13270 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 00:03:00 +00:00
b7d1cd02e3
Nellymoser handling in FLV
...
Originally committed as revision 13032 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-02 19:35:31 +00:00
