1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Commit Graph

23864 Commits

Author SHA1 Message Date
Ronald S. Bultje
d9521cb119 Fix FFM-based streaming from ffmpeg to ffserver. The basic problem is that
we'd memset() the codec context to zero, thereby setting audio input to U8
and video to YUV420P. For most video encoders, that actually works, but for
most audio codecs, it doesn't. This patch changes defaults to those set by
avcodec_context_get_defaults() and have ffmpeg figure out the optimal encoding
format itself if not set explicitely (as it does for the non-ffserver-cases
also).

Originally committed as revision 22751 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-31 21:02:34 +00:00
Ronald S. Bultje
d103218046 Add avcodec_copy_context().
Originally committed as revision 22750 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-31 20:40:49 +00:00
Stefano Sabatini
e33f1fa0a9 Add entry for the addition of av_match_ext() to the public API.
Originally committed as revision 22749 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-31 19:06:02 +00:00
Stefano Sabatini
1a70d12727 Make av_match_ext() declaration public (move its declaration out of
the #ifdef HAVE_AV_CONFIG_H block in avformat.h).

Originally committed as revision 22748 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-31 19:03:03 +00:00
Reimar Döffinger
5b03661fa7 Replace some "m" constraints by MANGLE to avoid issues with some compilers not
being able to compile it and deduplicate the code at the same time.

Originally committed as revision 30978 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-03-31 17:00:33 +00:00
Jai Menon
c7512f6bb3 Fix a few typos/grammar nits from r22739.
Originally committed as revision 22747 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-31 14:15:01 +00:00
Carl Eugen Hoyos
a4585e7834 Fix likely typo in r15937.
Originally committed as revision 22746 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-31 14:13:49 +00:00
Michael Niedermayer
fe8344a276 Add AVFMT_FLAG_NOFILLIN and AVFMT_FLAG_NOPARSE.
Originally committed as revision 22745 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-31 12:55:16 +00:00
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
2010-03-31 12:29:58 +00:00
Joakim Plate
46da7fa133 Probe aac codecs for CODEC_ID_PROBE.
Patch by Joakim Plate, elupus ecce se

Originally committed as revision 22742 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-31 10:45:15 +00:00
Anton Khirnov
8166c498df Remove superfluous space from a conversion table.
Patch by Anton Khirnov, wyskas gmail

Originally committed as revision 22741 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-31 09:22:31 +00:00
Alexander Strange
7a5c850be9 H264: Copy h264dsp when creating new slice threads
Fixes slice multithreading (broken in r22565)
Fixes issue1815

Originally committed as revision 22740 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-31 03:55:42 +00:00
Michael Niedermayer
49553ec865 Better documentation of -vsync
Originally committed as revision 22739 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-31 00:41:31 +00:00
Stefano Sabatini
330d86f593 Issue a more general message when the function which sets an option
fails.

It may fail not only because of an invalid value for the option, but
also for other reasons, e.g. memory problems etc.

Originally committed as revision 22738 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-30 23:46:30 +00:00
Stefano Sabatini
fc8b1075e1 Update APIchanges after the enum CodecType -> enum AVMediaType
transition.

Originally committed as revision 22737 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-30 23:42:06 +00:00
Stefano Sabatini
11491503c4 Move AVMediaType from libavcodec to libavutil.
This allows applications/libraries which require that symbol
(e.g. libavfilter) to be compiled without to depend on the presence of
libavcodec/avcodec.h, which may not be installed.

Originally committed as revision 22736 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-30 23:31:16 +00:00
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
2010-03-30 23:30:55 +00:00
Carl Eugen Hoyos
ca6e7708b4 Add spectral extension to the E-AC-3 decoder.
Original patch by Justin, updated and resubmitted by
Christophe Gisquet, christophe D gisquet A gmail

Originally committed as revision 22734 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-30 22:09:14 +00:00
Michael Niedermayer
1052b76f0f Fix implicit weight for b frames in mbaff.
Originally committed as revision 22733 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-30 21:05:11 +00:00
Michael Niedermayer
c28112fab6 Make sure the EC code does not attempt to use inter based concealment if there
is no reference frame available. (this can happen because the EC code will attempt
to use reference frames even for I/IDR frames)

Originally committed as revision 22732 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-30 20:46:46 +00:00
Ronald S. Bultje
aa1de0d9ed Split out code that auto-chooses a default pix_fmt/sample_fmt in their own
functions.

Originally committed as revision 22731 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-30 19:37:07 +00:00
Alexander Strange
13cb218724 configure: restore -mdynamic-no-pic on darwin (missing since r20497)
Darwin compilers default to PIC on, so -mdynamic-no-pic (which disables it
again) needs to be added to cflags before enable pic is checked.

Fixes compilation without --enable-shared at least the 10.6 system compiler
for x86-32.
Fixes speed regression on all darwin arches except x86-64.

Originally committed as revision 22730 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-30 16:28:00 +00:00
Benoit Fouet
32e543f866 Replace @returns by @return.
Originally committed as revision 22729 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-30 15:50:57 +00:00
Stephen Warren
3bccd93ac0 Set VDPAU H264 picture parameter field_order_cnt and frame_num at the
start of decoding a picture instead of at the end.
Fixes mmco01.264

Patch by Stephen Warren

Originally committed as revision 22728 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-30 08:10:29 +00:00
Stephen Warren
e5efbafdfd Fix VDPAU for H.264 streams with long reference frames.
Patch by Stephen Warren.

Originally committed as revision 22727 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-30 07:52:44 +00:00
Stefano Sabatini
38b9d8b8c4 Add missing entry for the YOP demuxer and video decoder addition.
Originally committed as revision 22726 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-29 23:34:08 +00:00
Stefano Sabatini
8a36b59ba6 Document url_exist().
Originally committed as revision 22725 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-29 22:29:14 +00:00
Mohamed Naufal
148bcae98c Implement YOP demuxer and video decoder.
Patch by Mohamed Naufal gmailify(naufal11).

Originally committed as revision 22724 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-29 22:17:01 +00:00
Reimar Döffinger
30ad1a6651 Include appropriate header in table generators instead of using a dummy
av_cold define.

Originally committed as revision 22723 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-29 21:32:38 +00:00
Reimar Döffinger
4f798a6ab2 Add some documentation about the table generation code.
Originally committed as revision 22722 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-29 21:01:45 +00:00
Reimar Döffinger
5b9c11ff96 Fix indentation.
Originally committed as revision 22721 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-29 20:58:19 +00:00
Reimar Döffinger
c2bfd81605 Some spelling fixes.
Originally committed as revision 22720 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-29 19:17:49 +00:00
Ronald S. Bultje
8ff5d1f319 Simplify interleaving code.
Originally committed as revision 22719 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-29 17:37:03 +00:00
Sam Gerstein
9cba6f5f40 Add a timeout to the select() call. Patch by Sam Gerstein <sgerstein bluefinlab
com>.

Originally committed as revision 22718 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-29 17:36:08 +00:00
Jai Menon
a0d5f3d39a Cosmetics : add a space after ",".
Originally committed as revision 22717 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-29 12:53:35 +00:00
Loren Merritt
b23cf13c67 indent
Originally committed as revision 22716 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-29 02:50:41 +00:00
Loren Merritt
3224079956 optimize init_vlc().
Reduce worst case time from O(N^2) to O(N*log(N)).
Speedup average case by a factor of 10 in ffv2 (total decoding speed +4-25%),
factor of 1.3 in ffvhuff (total +0.5%),
factor of 1.8 in indeo5 (total +1%),
factor of 1.1 in mjpeg (total +0.1%).

Originally committed as revision 22715 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-29 02:50:23 +00:00
Lou Logan
7ef7ae930c Update x264 presets in line with latest x264 changes.
Patch by Lou Logan.

Originally committed as revision 22714 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-29 01:34:33 +00:00
Michael Kostylev
e69decaef4 Clarify (Open)Solaris section of the documentation.
patch by Michael Kostylev, michael.kostylev gmail com

Originally committed as revision 22713 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-28 20:16:09 +00:00
Jai Menon
6aaa9bc9b5 Add myself as co-maintainer of tta.c
Originally committed as revision 22712 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-28 17:21:02 +00:00
Jai Menon
bac6ed4aeb TTA : Check if the output buffer size is within bounds.
Fixes issue 1848.

Originally committed as revision 22711 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-28 17:17:48 +00:00
Howard Chu
0f943ce663 Implement support to RTMP, RTMPT, RTMPE, RTMPTE, RTMPS protocols via
librtmp.

Patch by Howard Chu <hyc * highlandsun * com>.

Originally committed as revision 22710 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-28 13:39:36 +00:00
Stefano Sabatini
9bee245954 Document url_seek().
Originally committed as revision 22709 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-28 10:31:22 +00:00
Stefano Sabatini
4bfe67da24 Implement -convert_tags option, which converts showed tag names to the
FFmpeg generic tag names.

Originally committed as revision 22708 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-28 10:04:10 +00:00
Vitor Sessak
f990f6e3f7 Fix NUT (de)muxer warnings:
CC    libavformat/nutdec.o
libavformat/nutdec.c: In function ‘read_seek’:
libavformat/nutdec.c:862: warning: passing argument 3 of ‘av_tree_find’ from incompatible pointer type
./libavutil/tree.h:44: note: expected ‘int (*)(void *, const void *)’ but argument is of type ‘int (*)(struct Syncpoint *, struct Syncpoint *)’
libavformat/nutdec.c:871: warning: passing argument 3 of ‘av_tree_find’ from incompatible pointer type
./libavutil/tree.h:44: note: expected ‘int (*)(void *, const void *)’ but argument is of type ‘int (*)(struct Syncpoint *, struct Syncpoint *)’
libavformat/nutdec.c:879: warning: passing argument 3 of ‘av_tree_find’ from incompatible pointer type
./libavutil/tree.h:44: note: expected ‘int (*)(void *, const void *)’ but argument is of type ‘int (*)(struct Syncpoint *, struct Syncpoint *)’
CC    libavformat/nutenc.o
libavformat/nutenc.c: In function ‘write_packet’:
libavformat/nutenc.c:680: warning: passing argument 3 of ‘av_tree_find’ from incompatible pointer type
./libavutil/tree.h:44: note: expected ‘int (*)(void *, const void *)’ but argument is of type ‘int (*)(struct Syncpoint *, struct Syncpoint *)’

Originally committed as revision 22707 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-28 09:59:58 +00:00
Martin Storsjö
4c1202f76e Initialize ssrc and base_timestamp using ff_random_get_seed()
Originally committed as revision 22706 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-28 08:48:45 +00:00
Aurelien Jacobs
9b1db5ec99 correct first pts for ogg skeleton
Originally committed as revision 22705 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-28 01:15:08 +00:00
Stefano Sabatini
66b6c7458e Document the behavior of av_metadata_get() if the prev parameter is
NULL.

Originally committed as revision 22704 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-27 21:14:16 +00:00
Reimar Döffinger
d14f5391c1 Use more appropriate return values in txd demuxer.
Originally committed as revision 22703 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-27 19:10:24 +00:00
Reimar Döffinger
36031c2033 eacdata: fix a memleak, return partial packets and use proper return values.
Originally committed as revision 22702 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-27 19:09:46 +00:00