1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Commit Graph

21704 Commits

Author SHA1 Message Date
Michael Niedermayer
cc20679a41 Try to simplify av_estimate_timings_from_pts() like in ffmbc.
Note if this breaks for some file, report it please!

Originally committed as revision 20844 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 22:56:59 +00:00
Alexander Strange
35164ffe50 Correct truncated ID3v1 genre name.
Originally committed as revision 20843 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 22:31:29 +00:00
Michael Niedermayer
0e500e0db2 Debug av_log() about stream probing from ffmbc.
Originally committed as revision 20842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 22:15:51 +00:00
Michael Niedermayer
0cd55b0c18 Add CODEC_ID_DNXHD into the 25 fps case.
Merged from ffmbc.

Originally committed as revision 20841 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 22:12:20 +00:00
Michael Niedermayer
da457e7086 Simplify code by using av_metadata_set2().
somewhat based on ffmbc

Originally committed as revision 20840 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 21:07:47 +00:00
Michael Niedermayer
dfe9ee6b95 More entries for ff_id3v2_metadata_conv from ffmbc.
Originally committed as revision 20839 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 21:02:43 +00:00
Michael Niedermayer
8a98be1a08 s/author/artist/ for ID3
from ffmbc

Originally committed as revision 20838 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 21:01:49 +00:00
Michael Niedermayer
57f36fda56 More ID3v1 genres from ffmbc.
Originally committed as revision 20837 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 20:51:38 +00:00
Michael Niedermayer
12ad66712a Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
arrays of fixed length.
Code from ffmbc with changes to adapt to our metadata API.

Originally committed as revision 20836 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 20:27:29 +00:00
Michael Niedermayer
b8f11ec887 add av_metadata_set2(), AV_METADATA_DONT_STRDUP_KEY and AV_METADATA_DONT_STRDUP_VAL
Originally committed as revision 20835 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 20:24:19 +00:00
Michael Niedermayer
a181981eb4 Add flags to prevent strdup() on arguments to av_metadata_set2().
I cannot use the same ABI as ffmbc as value 2 is already used in ffmpeg,
besides the name AV_METADATA_NONCONST* makes no sense to me.
Add av_metadata_set2() that takes flags.

Originally committed as revision 20834 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 20:22:27 +00:00
Michael Niedermayer
813338a00a Until -DHAVE_AV_CONFIG_H is removed from ffplays compilation, *printf must be #undef.
Without this random changes to the header inclusion can trigger
linking failures, and these are not even picked up in some environments
(some fate machines didnt catch it).

Originally committed as revision 20833 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 18:46:29 +00:00
Michael Niedermayer
64b12fc317 Move #include where it belongs.
This as a sideeffect fixes the linking failure of ffplay.

Originally committed as revision 20832 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 18:42:39 +00:00
Michael Niedermayer
17986563eb Get rid of useless casts.
Originally committed as revision 20831 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 17:54:09 +00:00
Michael Niedermayer
60a92a77f3 APIchanges update for av_d2str()
Originally committed as revision 20830 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 17:10:30 +00:00
Michael Niedermayer
277c733237 Add a function to convert a number to a av_malloced string.
Originally committed as revision 20829 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 17:09:41 +00:00
Michael Niedermayer
005d9b57ad Print extradata in case of failure. I had this in my local tree and it
might be usefull for others ...

Originally committed as revision 20828 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 16:20:00 +00:00
Michael Niedermayer
c3d1532944 APIChanges & minor bump due to avg_frame_rate addition.
Originally committed as revision 20827 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 15:55:07 +00:00
Michael Niedermayer
02b398ef49 Add avg_frame_rate.
Originally committed as revision 20826 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 15:52:11 +00:00
Thilo Borgmann
1261b07f5f Read and decode block data in separate functions to prepare support for
multi-channel correlation mode.

Originally committed as revision 20825 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 15:40:26 +00:00
Carl Eugen Hoyos
a76cf4e197 Use constant CODEC_ID_NONE instead of 0 where appropriate.
Originally committed as revision 20824 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 15:28:00 +00:00
Michael Niedermayer
51ce8c2f87 Remove commented out code.
Originally committed as revision 20823 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 15:01:09 +00:00
Michael Niedermayer
e4637d6a60 Show help if no cmd line options are provided at all.
This safes the users time to find out which of -h --help -? works.

Originally committed as revision 20822 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 13:49:14 +00:00
Kostya Shishkov
0dae3e13e3 Factor out extradata reading code.
Borrowed from RM demuxer in FFmbc.

Originally committed as revision 20821 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 10:07:08 +00:00
Kostya Shishkov
119c61a30f RM audio stream version should be 16-bit followed by header size or reserved
word, so treat it this way instead of extracting different parts from 32-bit
value.

Originally committed as revision 20820 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 09:08:58 +00:00
Kostya Shishkov
461ef74116 Make RM demuxer look more like proper demuxer by introducing codec tags
instead of many strcmp() on always four-byte strings.
Idea borrowed from RM demuxer in FFmbc by Baptiste Coudurier.

Originally committed as revision 20819 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 08:51:27 +00:00
Kostya Shishkov
851ef8755b Factor out variable declaration
Originally committed as revision 20818 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 08:44:06 +00:00
David Conrad
a4914ac708 Clarify comment: although still hacky, it is correct for existing libtheora
Originally committed as revision 20817 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-12 20:18:49 +00:00
David Conrad
c39b94be60 libtheoraenc.c: mark keyframes
Originally committed as revision 20816 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-12 20:18:46 +00:00
David Conrad
5e15c7d95b Fix PTS for OGM codecs.
Fixes issue251

Originally committed as revision 20815 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-12 20:18:43 +00:00
Michael Niedermayer
7a14430ed7 Be less picky on invalid frame_pred_frame_dct values.
Fixed issue1615.

Originally committed as revision 20814 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-12 19:44:01 +00:00
Stefano Sabatini
663c2edf5a Only list libavfilter filters if libavfilter has been enabled during
configuration.
Fix compilation if FFmpeg is not configured with --enable-avfilter.

Originally committed as revision 20813 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-12 19:15:56 +00:00
Stefano Sabatini
c5dc602600 Move list_fmts() from ffmpeg.c to cmdutils.{h,c}, so that it can be
shared by the other ff* tools code.

Originally committed as revision 20812 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-12 17:45:20 +00:00
Reimar Döffinger
ae5e8caa3d Add ROQ format regression test.
Originally committed as revision 20811 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-12 17:34:24 +00:00
Jai Menon
94621d329f SVQ3 : Set avctx->pix_fmt correctly during decoder initialisation.
Fixes issue 1591.

Originally committed as revision 20810 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-12 17:10:05 +00:00
Stefano Sabatini
54c2421647 Add an entry for the av_bmg_next() function addition.
Originally committed as revision 20809 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-12 16:28:59 +00:00
Stefano Sabatini
3ba69a15c6 Implement av_bmg_next(), a Box-Muller Gaussian random generator.
See the thread:
"[FFmpeg-devel] [PATCH] Box-Muller gaussian generator".

Originally committed as revision 20808 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-12 16:24:37 +00:00
Stefano Sabatini
62d7566239 Implement a -filters option, listing all the available libavfilter
filters.
Currently filters are not registered, so the option will show none.

Originally committed as revision 20807 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-12 16:18:11 +00:00
John Stebbins
106fa129f4 Reset pts_buffers in av_read_frame_flush().
Patch by John Stebbins, jstebbins jetheaddev com

Originally committed as revision 20806 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-12 15:26:33 +00:00
Vitor Sessak
92f99a33b8 Commit functions used by both AMRNB and SIPR
Originally committed as revision 20805 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-12 13:58:07 +00:00
Stefano Sabatini
dae658d764 Reduce the number of encoded frames for the dnxhd tests to 5.
Significantly reduce codectest execution time.

Originally committed as revision 20804 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-12 13:52:19 +00:00
Tomas Härdin
6d01a97c86 Fail earlier for unsupported resolutions or pixel formats when encoding
dv.

Patch by Tomas Härdin, tomas D hardin A codemill D se

Originally committed as revision 20803 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-11 23:56:49 +00:00
Michael Niedermayer
47a81dad92 indent
Originally committed as revision 20802 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-11 21:50:08 +00:00
Michael Niedermayer
a0b468f5db Make sure av_new_packet() initializes the data and destruct pointers.
Some code does call av_free_packet() on failed av_new_packets(), this
prevents the freeing of uninitialized pointers.

Originally committed as revision 20801 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-11 21:49:30 +00:00
Stefano Sabatini
15a316c014 Make parse_filter() parsing more robust.
Add ';' and '\n' to the terminating characters for the name of a
filter, and ';' to the terminating characters for its args.

Originally committed as revision 20800 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-11 20:02:10 +00:00
Kostya Shishkov
cfac91fec3 Dump RTMP packet contents in debug mode
Originally committed as revision 20799 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-11 17:13:35 +00:00
Martin Storsjö
f8caa5441b 5l trocadero: don't forget to free packet in gen_connect()
Patch by Martin Storsjö ($name at $name dot `abbreviation for "street"`)

Originally committed as revision 20798 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-11 15:31:58 +00:00
Martin Storsjö
72b870b95b Do not try to interact with RTMP server after "stop" command was received.
Patch by Martin Storsjö ($name at $name dot `Sao Tome and Principe domain`)

Originally committed as revision 20797 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-11 11:37:21 +00:00
Carl Eugen Hoyos
ab176fdffb (Partly) support Metasoft MJPEG Codec, fixes half of issue 1611.
Originally committed as revision 20796 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-10 23:06:23 +00:00
Carl Eugen Hoyos
f63e5a7410 Support Etymonix MPEG-2 video codec, fixes issue 1603.
Originally committed as revision 20795 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-10 22:38:49 +00:00