d1ebd4a995
10l: Don't spawn a subshell when disabling vdpau.
...
Originally committed as revision 20867 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-14 18:18:51 +00:00
cc38e063be
Revert flvdec.c part of r20836
...
Log:
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.
Reason: memleak & fix is not trivial
Originally committed as revision 20866 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-14 15:59:19 +00:00
0f649d667e
Include dup/drop info if any frames where duplicated or droped
...
instead of when verbose>1.
From ffmbc0.3
Originally committed as revision 20865 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-14 12:40:10 +00:00
ed30e518e3
Off by 1 bugfix for nb_frames_dup.
...
From ffmbc0.3
Originally committed as revision 20864 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-14 12:37:24 +00:00
7debef33f8
Merge init & declaration of buf_end.
...
From ffmbc0.3
Originally committed as revision 20863 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-14 11:57:33 +00:00
b8af4fe9a5
Set reordered_opaque in default_reget_buffer() with internal buffers.
...
From ffmbc0.3, this one appears to be a bugfix.
Originally committed as revision 20862 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-14 11:42:17 +00:00
954a0b482a
Check sample_aspect_ratio validity for mpeg4/h263/h263p encoding.
...
Merged from ffmbc0.3
Originally committed as revision 20861 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-14 11:34:46 +00:00
f0bc8449b8
Use PIX_FMT_NONE for -1 when enum PixelFormat is expected (fixes two icc warnings).
...
Originally committed as revision 20860 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-14 11:18:28 +00:00
1f15747fc9
Use enum PixelFormat as type for input_pixfmt to avoid one icc warning.
...
Originally committed as revision 20859 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-14 10:52:32 +00:00
3db77ccf38
Support compressed formats in the V4L2 input device.
...
Patch by klchxbec AT freenet DOT de.
Originally committed as revision 20858 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-14 10:34:31 +00:00
9eb6e9d9d3
Add support for V4L2 compressed formats in the table used for converting
...
between V4L2 formats and ffmpeg's formats/codecs.
Patch by klchxbec AT freenet DOT de.
Originally committed as revision 20857 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-14 10:33:24 +00:00
9202218e5d
Use the correct type for the V4L2 format.
...
Originally committed as revision 20856 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-14 10:31:29 +00:00
158aa9f2db
Return pkt->size in v4l2_read_packet().
...
mmap_read_frame() takes care of ensuring that the packet size
is correct.
Originally committed as revision 20855 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-14 10:30:37 +00:00
deda2a4a72
Disable vdpau support if the detected libvdpau does not support MPEG-4.
...
Originally committed as revision 20854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-14 06:33:43 +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
22b16e6a5d
Factorize ic->streams[i] out,
...
change from ffmbc
Originally committed as revision 20852 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-14 03:23:45 +00:00
b3e88ae84b
Place { of the function where indent -kr wants it.
...
Also more consistent with the rest of the code.
Originally committed as revision 20851 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-14 01:15:02 +00:00
02483df478
Make sure the Metadata: header is not printed if the only metadata will not
...
be displayed. (idea from ffmbc)
Originally committed as revision 20850 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 23:39:20 +00:00
b298daea1a
Move dump_metadata() to where it is in ffmbc, looks better.
...
Originally committed as revision 20849 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 23:34:46 +00:00
229303d16c
indent
...
Originally committed as revision 20848 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 23:31:01 +00:00
4d9b678448
Skip dumping language twice.
...
This looks too ugly. Idea also from ffmbc.
Originally committed as revision 20847 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 23:30:41 +00:00
2e720e11bc
dump metadata for AVStreams & AVPrograms too.
...
Originally committed as revision 20846 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 23:27:43 +00:00
8b5e5ec5d7
Factorize dump_metadata() out.
...
Idea from ffmbc, code not, mine is a fraction of the size due to simpler
metadata API.
Originally committed as revision 20845 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 23:19:24 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Alex Converse