ffmpeg.git
10 years agoPrint usage instead of help when no files are specified.
Ramiro Polla [Mon, 21 Dec 2009 02:15:46 +0000 (02:15 +0000)]
Print usage instead of help when no files are specified.

Originally committed as revision 20905 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoSplit show_usage() out of show_help().
Ramiro Polla [Mon, 21 Dec 2009 02:12:34 +0000 (02:12 +0000)]
Split show_usage() out of show_help().

Originally committed as revision 20904 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoAdd a general [options] to the basic usage string.
Ramiro Polla [Mon, 21 Dec 2009 02:10:14 +0000 (02:10 +0000)]
Add a general [options] to the basic usage string.

Originally committed as revision 20903 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoFirst print the program description and then the basic usage line.
Ramiro Polla [Mon, 21 Dec 2009 02:09:17 +0000 (02:09 +0000)]
First print the program description and then the basic usage line.

Originally committed as revision 20902 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoRemove parameters no longer used in h[yc]scale().
Ramiro Polla [Mon, 21 Dec 2009 01:59:34 +0000 (01:59 +0000)]
Remove parameters no longer used in h[yc]scale().

Originally committed as revision 30099 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

10 years agoMove fast bilinear scaler code to the existing h[yc]scale_fast() functions.
Ramiro Polla [Mon, 21 Dec 2009 01:54:59 +0000 (01:54 +0000)]
Move fast bilinear scaler code to the existing h[yc]scale_fast() functions.

Originally committed as revision 30098 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

10 years agoRename function pointers used to convert from the input pixel format to the
Ramiro Polla [Mon, 21 Dec 2009 01:41:29 +0000 (01:41 +0000)]
Rename function pointers used to convert from the input pixel format to the
intermediate YV12 to a more descriptive name.

Originally committed as revision 30097 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

10 years agoCheck if chroma horizontal scaler is needed in sws_init_swScale().
Ramiro Polla [Mon, 21 Dec 2009 01:34:45 +0000 (01:34 +0000)]
Check if chroma horizontal scaler is needed in sws_init_swScale().

Originally committed as revision 30096 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

10 years agoRemove unused fields from SwsContext.
Ramiro Polla [Mon, 21 Dec 2009 01:30:55 +0000 (01:30 +0000)]
Remove unused fields from SwsContext.

Originally committed as revision 30095 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

10 years agoIndentation.
Ramiro Polla [Sun, 20 Dec 2009 17:42:35 +0000 (17:42 +0000)]
Indentation.

Originally committed as revision 30087 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

10 years agoIndent.
Ramiro Polla [Sun, 20 Dec 2009 17:15:01 +0000 (17:15 +0000)]
Indent.

Originally committed as revision 30086 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

10 years agoSet fast_bilinear functions in sws_init_swScale().
Ramiro Polla [Sun, 20 Dec 2009 17:09:46 +0000 (17:09 +0000)]
Set fast_bilinear functions in sws_init_swScale().

Originally committed as revision 30085 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

10 years agoSet horizontal scaler's range conversion in context in sws_init_swScale().
Ramiro Polla [Sun, 20 Dec 2009 16:32:58 +0000 (16:32 +0000)]
Set horizontal scaler's range conversion in context in sws_init_swScale().

Originally committed as revision 30082 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

10 years agoAdd new fields for the VDPAU/MPEG-4 back-end.
Gwenole Beauchesne [Sun, 20 Dec 2009 16:31:21 +0000 (16:31 +0000)]
Add new fields for the VDPAU/MPEG-4 back-end.

Originally committed as revision 20901 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoSet horizontal scaler's src offsets in context in sws_init_swScale().
Ramiro Polla [Sun, 20 Dec 2009 16:21:25 +0000 (16:21 +0000)]
Set horizontal scaler's src offsets in context in sws_init_swScale().

Originally committed as revision 30081 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

10 years agoAdd long_name for Xxan codec.
Diego Biurrun [Sat, 19 Dec 2009 18:41:03 +0000 (18:41 +0000)]
Add long_name for Xxan codec.

Originally committed as revision 20900 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoImprove handling allocated buffers in Xan decoder
Kostya Shishkov [Sat, 19 Dec 2009 17:04:30 +0000 (17:04 +0000)]
Improve handling allocated buffers in Xan decoder

Originally committed as revision 20899 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agocosmetics: reindent a bit
Kostya Shishkov [Sat, 19 Dec 2009 16:39:21 +0000 (16:39 +0000)]
cosmetics: reindent a bit

Originally committed as revision 20898 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoAdd tables used by both AMR-NB and SIPR
Vitor Sessak [Sat, 19 Dec 2009 14:05:31 +0000 (14:05 +0000)]
Add tables used by both AMR-NB and SIPR

Originally committed as revision 20897 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoCosmetic: indent after last change.
Mike Melanson [Sat, 19 Dec 2009 07:34:11 +0000 (07:34 +0000)]
Cosmetic: indent after last change.

Originally committed as revision 20896 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoOptimize unpack_vectors() by not shuffling around redundant vectors.
Mike Melanson [Sat, 19 Dec 2009 07:33:10 +0000 (07:33 +0000)]
Optimize unpack_vectors() by not shuffling around redundant vectors.
Inspired by guidance from Dark Shikari. On a Core 2 Duo 2.0 GHz, this
change decodes the 10-minute Big Buck Bunny 1080p short about 2 seconds
faster.

Originally committed as revision 20895 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoMore sane error message when extradata has not been set.
Michael Niedermayer [Fri, 18 Dec 2009 15:50:39 +0000 (15:50 +0000)]
More sane error message when extradata has not been set.

Originally committed as revision 20894 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoSwap red and blue when decoding r210.
Carl Eugen Hoyos [Fri, 18 Dec 2009 10:42:26 +0000 (10:42 +0000)]
Swap red and blue when decoding r210.

Originally committed as revision 20893 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoIt appears that waveformatextensible is mandatory for more cases than
Michael Niedermayer [Fri, 18 Dec 2009 06:03:12 +0000 (06:03 +0000)]
It appears that waveformatextensible is mandatory for more cases than
just channels>2. The 16bit case is from MSDN, the 48khz is from less a reliable
www page (sorry i cant find the URL anymore).

Originally committed as revision 20892 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoAdd decoder for R210 (uncompressed 10-bit RGB) codec.
Reimar Döffinger [Thu, 17 Dec 2009 18:56:56 +0000 (18:56 +0000)]
Add decoder for R210 (uncompressed 10-bit RGB) codec.

Originally committed as revision 20891 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoCD+G demuxer and decoder
Michael Tison [Thu, 17 Dec 2009 17:25:31 +0000 (17:25 +0000)]
CD+G demuxer and decoder

Patch by Michael Tison (gmail address: blackspike@....)

Originally committed as revision 20890 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years ago10l : make sure probe buffer is large enough.
Jai Menon [Thu, 17 Dec 2009 13:05:37 +0000 (13:05 +0000)]
10l : make sure probe buffer is large enough.

Originally committed as revision 20889 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoOnly add 1 index entry per keyframe.
Michael Niedermayer [Wed, 16 Dec 2009 21:24:04 +0000 (21:24 +0000)]
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

10 years agoSet bits_per_raw_sample appropriately in dpx decoder.
Reimar Döffinger [Wed, 16 Dec 2009 20:46:48 +0000 (20:46 +0000)]
Set bits_per_raw_sample appropriately in dpx decoder.

Originally committed as revision 20887 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoParse ID3v[12] metadata from TTA files.
Jai Menon [Wed, 16 Dec 2009 19:18:48 +0000 (19:18 +0000)]
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

10 years agoCosmetics: make celp_filters.* formatting more consistent with the rest of
Vitor Sessak [Wed, 16 Dec 2009 17:15:57 +0000 (17:15 +0000)]
Cosmetics: make celp_filters.* formatting more consistent with the rest of
FFmpeg

Originally committed as revision 20885 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoOptimize ff_celp_lp_synthesis_filterf(). 50% faster in my tests.
Vitor Sessak [Wed, 16 Dec 2009 17:09:33 +0000 (17:09 +0000)]
Optimize ff_celp_lp_synthesis_filterf(). 50% faster in my tests.

Originally committed as revision 20884 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoList myself as the maintainer of celp_filters.*
Vitor Sessak [Wed, 16 Dec 2009 17:08:23 +0000 (17:08 +0000)]
List myself as the maintainer of celp_filters.*

Originally committed as revision 20883 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoUpdate ffm reference checksums as a result of r20869.
Jai Menon [Wed, 16 Dec 2009 14:55:01 +0000 (14:55 +0000)]
Update ffm reference checksums as a result of r20869.

Originally committed as revision 20882 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoReply to RTMP ping with the same value as received by client.
Martin Storsjö [Wed, 16 Dec 2009 12:49:38 +0000 (12:49 +0000)]
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

10 years agoAdd -vlang option to set ISO 639 video stream language code.
Matthieu Crapet [Wed, 16 Dec 2009 12:08:01 +0000 (12:08 +0000)]
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

10 years agoUndo r20874: It broke AAC decoding.
Carl Eugen Hoyos [Wed, 16 Dec 2009 11:39:14 +0000 (11:39 +0000)]
Undo r20874: It broke AAC decoding.

Originally committed as revision 20879 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoRemove unused variable, fixes the warning:
Diego Biurrun [Tue, 15 Dec 2009 23:41:22 +0000 (23:41 +0000)]
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

10 years agoUse positive logic in opt_target() for selecting the PAL/others
Stefano Sabatini [Tue, 15 Dec 2009 23:25:16 +0000 (23:25 +0000)]
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

10 years agoSimplify freeing of audio_language and subtitle_language.
Matthieu Crapet [Tue, 15 Dec 2009 20:36:14 +0000 (20:36 +0000)]
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

10 years agoUse enum and constant to avoid three icc warnings.
Carl Eugen Hoyos [Tue, 15 Dec 2009 15:57:18 +0000 (15:57 +0000)]
Use enum and constant to avoid three icc warnings.

Originally committed as revision 20874 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoFix a typo in documentation.
Ramiro Polla [Tue, 15 Dec 2009 13:46:42 +0000 (13:46 +0000)]
Fix a typo in documentation.

Originally committed as revision 20873 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoFactorize opt+1 out in parse_options(), simplify.
Stefano Sabatini [Mon, 14 Dec 2009 23:47:22 +0000 (23:47 +0000)]
Factorize opt+1 out in parse_options(), simplify.

Originally committed as revision 20872 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoDefine _XOPEN_SOURCE as 600 before including a XSI extension header.
Carl Eugen Hoyos [Mon, 14 Dec 2009 23:23:09 +0000 (23:23 +0000)]
Define _XOPEN_SOURCE as 600 before including a XSI extension header.

Originally committed as revision 20871 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoUse symbolic names for PAL/NTSC/FILM rather than numeric constants in opt_target().
Stefano Sabatini [Mon, 14 Dec 2009 23:18:49 +0000 (23:18 +0000)]
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

10 years agoFix breakage introduced by setting the sample_fmt to SAMPLE_FMT_NONE (r20623). This...
Benjamin Larsson [Mon, 14 Dec 2009 21:08:21 +0000 (21:08 +0000)]
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

10 years agoCorrect typo
Vitor Sessak [Mon, 14 Dec 2009 19:28:33 +0000 (19:28 +0000)]
Correct typo

Originally committed as revision 20868 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years ago10l: Don't spawn a subshell when disabling vdpau.
Alex Converse [Mon, 14 Dec 2009 18:18:51 +0000 (18:18 +0000)]
10l: Don't spawn a subshell when disabling vdpau.

Originally committed as revision 20867 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoRevert flvdec.c part of r20836
Michael Niedermayer [Mon, 14 Dec 2009 15:59:19 +0000 (15:59 +0000)]
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

10 years agoInclude dup/drop info if any frames where duplicated or droped
Michael Niedermayer [Mon, 14 Dec 2009 12:40:10 +0000 (12:40 +0000)]
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

10 years agoOff by 1 bugfix for nb_frames_dup.
Michael Niedermayer [Mon, 14 Dec 2009 12:37:24 +0000 (12:37 +0000)]
Off by 1 bugfix for nb_frames_dup.
From ffmbc0.3

Originally committed as revision 20864 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoMerge init & declaration of buf_end.
Michael Niedermayer [Mon, 14 Dec 2009 11:57:33 +0000 (11:57 +0000)]
Merge init & declaration of buf_end.
From ffmbc0.3

Originally committed as revision 20863 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoSet reordered_opaque in default_reget_buffer() with internal buffers.
Michael Niedermayer [Mon, 14 Dec 2009 11:42:17 +0000 (11:42 +0000)]
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

10 years agoCheck sample_aspect_ratio validity for mpeg4/h263/h263p encoding.
Michael Niedermayer [Mon, 14 Dec 2009 11:34:46 +0000 (11:34 +0000)]
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

10 years agoUse PIX_FMT_NONE for -1 when enum PixelFormat is expected (fixes two icc warnings).
Carl Eugen Hoyos [Mon, 14 Dec 2009 11:18:28 +0000 (11:18 +0000)]
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

10 years agoUse enum PixelFormat as type for input_pixfmt to avoid one icc warning.
Carl Eugen Hoyos [Mon, 14 Dec 2009 10:52:32 +0000 (10:52 +0000)]
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

10 years agoSupport compressed formats in the V4L2 input device.
Luca Abeni [Mon, 14 Dec 2009 10:34:31 +0000 (10:34 +0000)]
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

10 years agoAdd support for V4L2 compressed formats in the table used for converting
Luca Abeni [Mon, 14 Dec 2009 10:33:24 +0000 (10:33 +0000)]
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

10 years agoUse the correct type for the V4L2 format.
Luca Abeni [Mon, 14 Dec 2009 10:31:29 +0000 (10:31 +0000)]
Use the correct type for the V4L2 format.

Originally committed as revision 20856 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoReturn pkt->size in v4l2_read_packet().
Luca Abeni [Mon, 14 Dec 2009 10:30:37 +0000 (10:30 +0000)]
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

10 years agoDisable vdpau support if the detected libvdpau does not support MPEG-4.
Alex Converse [Mon, 14 Dec 2009 06:33:43 +0000 (06:33 +0000)]
Disable vdpau support if the detected libvdpau does not support MPEG-4.

Originally committed as revision 20854 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoFLV 8-bit PCM is unsigned, not signed
Daniel Verkamp [Mon, 14 Dec 2009 03:30:25 +0000 (03:30 +0000)]
FLV 8-bit PCM is unsigned, not signed

Fixes issue #1569

Originally committed as revision 20853 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoFactorize ic->streams[i] out,
Michael Niedermayer [Mon, 14 Dec 2009 03:23:45 +0000 (03:23 +0000)]
Factorize ic->streams[i] out,
change from ffmbc

Originally committed as revision 20852 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoPlace { of the function where indent -kr wants it.
Michael Niedermayer [Mon, 14 Dec 2009 01:15:02 +0000 (01:15 +0000)]
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

10 years agoMake sure the Metadata: header is not printed if the only metadata will not
Michael Niedermayer [Sun, 13 Dec 2009 23:39:20 +0000 (23:39 +0000)]
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

10 years agoMove dump_metadata() to where it is in ffmbc, looks better.
Michael Niedermayer [Sun, 13 Dec 2009 23:34:46 +0000 (23:34 +0000)]
Move dump_metadata() to where it is in ffmbc, looks better.

Originally committed as revision 20849 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoindent
Michael Niedermayer [Sun, 13 Dec 2009 23:31:01 +0000 (23:31 +0000)]
indent

Originally committed as revision 20848 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoSkip dumping language twice.
Michael Niedermayer [Sun, 13 Dec 2009 23:30:41 +0000 (23:30 +0000)]
Skip dumping language twice.
This looks too ugly. Idea also from ffmbc.

Originally committed as revision 20847 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agodump metadata for AVStreams & AVPrograms too.
Michael Niedermayer [Sun, 13 Dec 2009 23:27:43 +0000 (23:27 +0000)]
dump metadata for AVStreams & AVPrograms too.

Originally committed as revision 20846 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoFactorize dump_metadata() out.
Michael Niedermayer [Sun, 13 Dec 2009 23:19:24 +0000 (23:19 +0000)]
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

10 years agoTry to simplify av_estimate_timings_from_pts() like in ffmbc.
Michael Niedermayer [Sun, 13 Dec 2009 22:56:59 +0000 (22:56 +0000)]
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

10 years agoCorrect truncated ID3v1 genre name.
Alexander Strange [Sun, 13 Dec 2009 22:31:29 +0000 (22:31 +0000)]
Correct truncated ID3v1 genre name.

Originally committed as revision 20843 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoDebug av_log() about stream probing from ffmbc.
Michael Niedermayer [Sun, 13 Dec 2009 22:15:51 +0000 (22:15 +0000)]
Debug av_log() about stream probing from ffmbc.

Originally committed as revision 20842 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoAdd CODEC_ID_DNXHD into the 25 fps case.
Michael Niedermayer [Sun, 13 Dec 2009 22:12:20 +0000 (22:12 +0000)]
Add CODEC_ID_DNXHD into the 25 fps case.
Merged from ffmbc.

Originally committed as revision 20841 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoSimplify code by using av_metadata_set2().
Michael Niedermayer [Sun, 13 Dec 2009 21:07:47 +0000 (21:07 +0000)]
Simplify code by using av_metadata_set2().
somewhat based on ffmbc

Originally committed as revision 20840 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoMore entries for ff_id3v2_metadata_conv from ffmbc.
Michael Niedermayer [Sun, 13 Dec 2009 21:02:43 +0000 (21:02 +0000)]
More entries for ff_id3v2_metadata_conv from ffmbc.

Originally committed as revision 20839 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agos/author/artist/ for ID3
Michael Niedermayer [Sun, 13 Dec 2009 21:01:49 +0000 (21:01 +0000)]
s/author/artist/ for ID3
from ffmbc

Originally committed as revision 20838 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoMore ID3v1 genres from ffmbc.
Michael Niedermayer [Sun, 13 Dec 2009 20:51:38 +0000 (20:51 +0000)]
More ID3v1 genres from ffmbc.

Originally committed as revision 20837 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoUse AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
Michael Niedermayer [Sun, 13 Dec 2009 20:27:29 +0000 (20:27 +0000)]
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

10 years agoadd av_metadata_set2(), AV_METADATA_DONT_STRDUP_KEY and AV_METADATA_DONT_STRDUP_VAL
Michael Niedermayer [Sun, 13 Dec 2009 20:24:19 +0000 (20:24 +0000)]
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

10 years agoAdd flags to prevent strdup() on arguments to av_metadata_set2().
Michael Niedermayer [Sun, 13 Dec 2009 20:22:27 +0000 (20:22 +0000)]
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

10 years agoUntil -DHAVE_AV_CONFIG_H is removed from ffplays compilation, *printf must be #undef.
Michael Niedermayer [Sun, 13 Dec 2009 18:46:29 +0000 (18:46 +0000)]
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

10 years agoMove #include where it belongs.
Michael Niedermayer [Sun, 13 Dec 2009 18:42:39 +0000 (18:42 +0000)]
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

10 years agoGet rid of useless casts.
Michael Niedermayer [Sun, 13 Dec 2009 17:54:09 +0000 (17:54 +0000)]
Get rid of useless casts.

Originally committed as revision 20831 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoAPIchanges update for av_d2str()
Michael Niedermayer [Sun, 13 Dec 2009 17:10:30 +0000 (17:10 +0000)]
APIchanges update for av_d2str()

Originally committed as revision 20830 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoAdd a function to convert a number to a av_malloced string.
Michael Niedermayer [Sun, 13 Dec 2009 17:09:41 +0000 (17:09 +0000)]
Add a function to convert a number to a av_malloced string.

Originally committed as revision 20829 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoPrint extradata in case of failure. I had this in my local tree and it
Michael Niedermayer [Sun, 13 Dec 2009 16:20:00 +0000 (16:20 +0000)]
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

10 years agoAPIChanges & minor bump due to avg_frame_rate addition.
Michael Niedermayer [Sun, 13 Dec 2009 15:55:07 +0000 (15:55 +0000)]
APIChanges & minor bump due to avg_frame_rate addition.

Originally committed as revision 20827 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoAdd avg_frame_rate.
Michael Niedermayer [Sun, 13 Dec 2009 15:52:11 +0000 (15:52 +0000)]
Add avg_frame_rate.

Originally committed as revision 20826 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoRead and decode block data in separate functions to prepare support for
Thilo Borgmann [Sun, 13 Dec 2009 15:40:26 +0000 (15:40 +0000)]
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

10 years agoUse constant CODEC_ID_NONE instead of 0 where appropriate.
Carl Eugen Hoyos [Sun, 13 Dec 2009 15:28:00 +0000 (15:28 +0000)]
Use constant CODEC_ID_NONE instead of 0 where appropriate.

Originally committed as revision 20824 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoRemove commented out code.
Michael Niedermayer [Sun, 13 Dec 2009 15:01:09 +0000 (15:01 +0000)]
Remove commented out code.

Originally committed as revision 20823 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoShow help if no cmd line options are provided at all.
Michael Niedermayer [Sun, 13 Dec 2009 13:49:14 +0000 (13:49 +0000)]
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

10 years agoFactor out extradata reading code.
Kostya Shishkov [Sun, 13 Dec 2009 10:07:08 +0000 (10:07 +0000)]
Factor out extradata reading code.
Borrowed from RM demuxer in FFmbc.

Originally committed as revision 20821 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoRM audio stream version should be 16-bit followed by header size or reserved
Kostya Shishkov [Sun, 13 Dec 2009 09:08:58 +0000 (09:08 +0000)]
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

10 years agoMake RM demuxer look more like proper demuxer by introducing codec tags
Kostya Shishkov [Sun, 13 Dec 2009 08:51:27 +0000 (08:51 +0000)]
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

10 years agoFactor out variable declaration
Kostya Shishkov [Sun, 13 Dec 2009 08:44:06 +0000 (08:44 +0000)]
Factor out variable declaration

Originally committed as revision 20818 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoClarify comment: although still hacky, it is correct for existing libtheora
David Conrad [Sat, 12 Dec 2009 20:18:49 +0000 (20:18 +0000)]
Clarify comment: although still hacky, it is correct for existing libtheora

Originally committed as revision 20817 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agolibtheoraenc.c: mark keyframes
David Conrad [Sat, 12 Dec 2009 20:18:46 +0000 (20:18 +0000)]
libtheoraenc.c: mark keyframes

Originally committed as revision 20816 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoFix PTS for OGM codecs.
David Conrad [Sat, 12 Dec 2009 20:18:43 +0000 (20:18 +0000)]
Fix PTS for OGM codecs.
Fixes issue251

Originally committed as revision 20815 to svn://svn.ffmpeg.org/ffmpeg/trunk