Michael Tison
a3d995c1eb
CD+G demuxer and decoder
...
Patch by Michael Tison (gmail address: blackspike@....)
Originally committed as revision 20890 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-17 17:25:31 +00:00
Jai Menon
8993535cbb
10l : make sure probe buffer is large enough.
...
Originally committed as revision 20889 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-17 13:05:37 +00:00
Michael Niedermayer
134271c232
Only add 1 index entry per keyframe.
...
Idea from a patch by samsung.
Originally committed as revision 20888 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-16 21:24:04 +00:00
Reimar Döffinger
c3abb55141
Set bits_per_raw_sample appropriately in dpx decoder.
...
Originally committed as revision 20887 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-16 20:46:48 +00:00
Jai Menon
22ff336145
Parse ID3v[12] metadata from TTA files.
...
As a side-effect, this commit also fixes issue 1310.
Originally committed as revision 20886 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-16 19:18:48 +00:00
Vitor Sessak
5c910fcad8
Cosmetics: make celp_filters.* formatting more consistent with the rest of
...
FFmpeg
Originally committed as revision 20885 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-16 17:15:57 +00:00
Vitor Sessak
6ef607c2d5
Optimize ff_celp_lp_synthesis_filterf(). 50% faster in my tests.
...
Originally committed as revision 20884 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-16 17:09:33 +00:00
Vitor Sessak
5ad14c6c3a
List myself as the maintainer of celp_filters.*
...
Originally committed as revision 20883 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-16 17:08:23 +00:00
Jai Menon
18eb23db7d
Update ffm reference checksums as a result of r20869.
...
Originally committed as revision 20882 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-16 14:55:01 +00:00
Martin Storsjö
4aaebf78f5
Reply to RTMP ping with the same value as received by client.
...
Patch by Martin Storsjö ($name at $name dot \163\164)
Originally committed as revision 20881 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-16 12:49:38 +00:00
Matthieu Crapet
0fc2c0f618
Add -vlang option to set ISO 639 video stream language code.
...
This is similar to existing -alang & -slang options.
Patch by Matthieu Crapet m${surname} ^ gmail com.
Originally committed as revision 20880 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-16 12:08:01 +00:00
Carl Eugen Hoyos
b0bc928b86
Undo r20874: It broke AAC decoding.
...
Originally committed as revision 20879 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-16 11:39:14 +00:00
Diego Biurrun
18a49f118c
Remove unused variable, fixes the warning:
...
libavformat/apetag.c:38: warning: unused variable `l'
Originally committed as revision 20878 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-15 23:41:22 +00:00
Stefano Sabatini
06a3c9c45a
Use positive logic in opt_target() for selecting the PAL/others
...
options, make its semantics mildly easier to compile by human minds.
Originally committed as revision 20877 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-15 23:25:16 +00:00
Matthieu Crapet
e6db28ceb2
Simplify freeing of audio_language and subtitle_language.
...
Patch by Matthieu, mcrapet gmail com
Originally committed as revision 20875 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-15 20:36:14 +00:00
Carl Eugen Hoyos
257c7147e1
Use enum and constant to avoid three icc warnings.
...
Originally committed as revision 20874 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-15 15:57:18 +00:00
Ramiro Polla
798e589d4a
Fix a typo in documentation.
...
Originally committed as revision 20873 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-15 13:46:42 +00:00
Stefano Sabatini
c3c7832479
Factorize opt+1 out in parse_options(), simplify.
...
Originally committed as revision 20872 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-14 23:47:22 +00:00
Carl Eugen Hoyos
3d1ebac8f7
Define _XOPEN_SOURCE as 600 before including a XSI extension header.
...
Originally committed as revision 20871 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-14 23:23:09 +00:00
Stefano Sabatini
01558ee6c9
Use symbolic names for PAL/NTSC/FILM rather than numeric constants in opt_target().
...
Improve readability.
Originally committed as revision 20870 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-14 23:18:49 +00:00
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
2009-12-14 21:08:21 +00:00
Vitor Sessak
8b484d0f07
Correct typo
...
Originally committed as revision 20868 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-14 19:28:33 +00:00
Alex Converse
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Carl Eugen Hoyos
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
Carl Eugen Hoyos
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
Luca Abeni
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
Luca Abeni
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
Luca Abeni
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
Luca Abeni
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
Alex Converse
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
Daniel Verkamp
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
229303d16c
indent
...
Originally committed as revision 20848 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 23:31:01 +00:00
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
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