har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
44,266 Commits 2 Branches 401 Tags
Commit Graph

1834 Commits

Author SHA1 Message Date
Baptiste Coudurier
3c5e1b36d5 LOL, 100l, really fix warning: 
ffmpeg.c: In function 'new_audio_stream':
ffmpeg.c:665: warning: 'best' may be used uninitialized in this function
ffmpeg.c:665: note: 'best' was declared here

Originally committed as revision 24034 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-03 23:24:37 +00:00
Baptiste Coudurier
947cbeca16 Fix warning: 
ffmpeg.c: In function 'new_audio_stream':
ffmpeg.c:665: warning: 'best' may be used uninitialized in this function
ffmpeg.c:665: note: 'best' was declared here

Originally committed as revision 24033 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-03 23:22:25 +00:00
Rodney Baker
2d525ef483 Change all occurences of "inofficial" to "unofficial" in code, comments 
and options. Keep old options until next major version bump.

Patch by Rodney Baker, rodney d baker a iinet d net d au

Originally committed as revision 24021 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-03 15:35:23 +00:00
Baptiste Coudurier
8abcbf2d54 Reduce codec time base when stream copying 
Originally committed as revision 24019 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-03 10:12:22 +00:00
Baptiste Coudurier
f96363df7a Set graph swscale opts before parsing it, that way opts are available 
when auto-adding scalers.

Originally committed as revision 24015 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-03 03:11:04 +00:00
Stefano Sabatini
2b4abbd6f5 Move colorspace.h from libavcodec to libavutil. 
Avoid a compile-time dependency of the pad filter on libavcodec.

Originally committed as revision 23940 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-01 18:49:44 +00:00
Mike Scheutzow
006e8108de Add new option "streamid" to set the value of an outfile streamid. 
Patch by Mike Scheutzow, scheutzow alcatel-lucent com

Originally committed as revision 23917 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-30 22:35:57 +00:00
Måns Rullgård
2829ce4b40 Remove PPC perf counter support 
This functionality is better accessed through tools like oprofile.

Originally committed as revision 23808 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-26 22:23:35 +00:00
Stefano Sabatini
25d3445811 Rename rec_timestamp to recording_timestamp, for consistency with 
recording_time.

Originally committed as revision 23727 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-22 22:54:39 +00:00
Alexander Strange
28db32159e ffmpeg: cosmetics: combine two variable declarations 
Originally committed as revision 23677 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-21 04:15:18 +00:00
Michael Niedermayer
54a13282bd Deprecate -crop* arguments, they currently are buggy (issue1957) and probably 
will be fixed by removing them.

Originally committed as revision 23607 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-14 17:35:46 +00:00
Justin Ruggles
e91376d1f6 10l: audio_buf is already a uint8_t* so no need to cast it 
Originally committed as revision 23571 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-10 19:50:14 +00:00
Justin Ruggles
79c85beba8 Allocate enough memory for audio_buf to fit a full output frame. 
Also, use audio_buf when encoding the final frame.
Fixes Issue 1921.

Originally committed as revision 23570 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-10 19:40:56 +00:00
Diego Biurrun
a1629e2848 Remove support for pre-Haiku, non-POSIX, non-C99 BeOS variants. 
BeOS support has been broken for many years and the "maintainer" of the port
has not reacted to countless requests to get the port fixed.
approved by Mans

Originally committed as revision 23562 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-10 16:51:14 +00:00
Luca Abeni
b659c8b4b7 In case of stream copy, copy the extradata from the input codec context to 
the output codec context (instead of just copying a pointer to the extradata).

Originally committed as revision 23538 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-08 19:27:29 +00:00
Stefano Sabatini
83a36b2e0b Change type of {audio,video,subtitle}_codec_tag variables from int to 
unsigned int, as the corresponding variable set in
AVCodecContext.codec_tag is unsigned int.

Originally committed as revision 23441 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-03 18:40:31 +00:00
Janne Grunau
770e50ae80 ffmpeg: offer alternatives for experimental codecs if they exist 
Originally committed as revision 23398 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-31 22:35:14 +00:00
Janne Grunau
4e605bc3fd ffmpeg: fail if user selected codec is experimental and strict_std_compliance > experimental 
Originally committed as revision 23397 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-31 22:31:51 +00:00
Ramiro Polla
c56e9e05ab Open 2-pass logfile in binary mode for both reading and writing. 
This fixes a regression on Windows introduced by r22769 in which the data read
from the file was not properly zero terminated. The file was read as text,
which caused the \r characters to be suppressed. Since the zero termination
happens at the end of the buffer, and there was one byte less read per line,
this caused the remaining space on the buffer to contain random data.

Originally committed as revision 23251 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-22 21:32:57 +00:00
Baptiste Coudurier
521cfa4aae rename -vfilters cli option to -vf 
Originally committed as revision 23100 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-12 01:47:14 +00:00
Baptiste Coudurier
d21f58b52d cosmetics, rename loop to frame_available 
Originally committed as revision 23092 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-11 17:25:18 +00:00
Baptiste Coudurier
a9f3cb9372 rename curr_filter to last_filter, factorize filter declaration 
Originally committed as revision 23091 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-11 17:23:06 +00:00
Baptiste Coudurier
79b90b2549 cosmetics: indentation, whitespaces 
Originally committed as revision 23090 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-11 17:18:13 +00:00
Baptiste Coudurier
6e82e7fa48 simplify, reuse existing args variable 
Originally committed as revision 23089 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-11 17:16:52 +00:00
Baptiste Coudurier
aa1249b8aa cosmetics: filt_graph_all -> graph, like in ffplay.c 
Originally committed as revision 23088 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-11 17:14:36 +00:00
Michael Niedermayer
0c22311b56 Remove messy pading hack in ffmpeg.c. 
Use avfilters if you want padding!

Originally committed as revision 23050 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-07 12:16:23 +00:00
Michael Niedermayer
bdab692f48 Make sure get_filtered_video_pic() doesnt loose interlacedframe/tff. 
Originally committed as revision 23049 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-07 12:05:24 +00:00
Michael Niedermayer
46847a336e avfilter support for ffmpeg 
Originally committed as revision 23043 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-07 09:43:21 +00:00
Michael Niedermayer
ff866063e9 Print warnig if requested samplingrate is unsupported. 
Originally committed as revision 22991 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-30 00:06:36 +00:00
Stefano Sabatini
a31e795607 Make ffmpeg use print_error() to make apparent the exact cause of 
failure happened when trying to open the output file.

Originally committed as revision 22973 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-26 22:36:55 +00:00
Stefano Sabatini
2ef6c1242a Mark av_metadata_set() as deprecated, and use av_metadata_set2() 
in its place.

av_metadata_set() is going to be dropped at the next major bump.

Originally committed as revision 22961 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-25 14:27:42 +00:00
Michael Niedermayer
10d0f5e035 Make sure ffmpeg chooses a supported samplerte if the encoder supports 
just some.

Originally committed as revision 22943 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-22 09:40:51 +00:00
Cyril Russo
9b157b0ccd Fix compilation error of ffmpeg and ffplay with --disable-avdevice. 
Patch by Cyril Russo, stage D nexvision A laposte net

Originally committed as revision 22940 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-22 08:55:23 +00:00
Robert Krüger
2328e5a289 Allow setting the environment variable FFMPEG_DATADIR to locate preset files. 
Patch by Robert Krüger <krueger signal7 de>.

Originally committed as revision 22923 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-20 17:37:06 +00:00
Baptiste Coudurier
f32f7d8b24 Take ticks per frame into account when warning about difference between 
container and codec frame rate.

Originally committed as revision 22895 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-16 22:58:56 +00:00
Anton Khirnov
46e6fb4c54 Simplify writing stream metadata. 
Patch by Anton Khirnov <wyskas gmail com>.

Originally committed as revision 22809 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-05 19:54:11 +00:00
Anton Khirnov
1a6498d78c Don't overwrite user-supplied metadata with metadata mapped from an input file. 
Patch by Anton Khirnov <wyskas gmail com>.

Originally committed as revision 22808 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-05 19:53:25 +00:00
Stefano Sabatini
685598f58d Reindent. 
Originally committed as revision 22798 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-04 13:50:38 +00:00
Stefano Sabatini
ac61f59a76 Rename av_encode() to av_transcode(), the new name is more meaningful. 
Originally committed as revision 22797 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-04 13:50:34 +00:00
Carl Eugen Hoyos
18590be655 Use AVDISCARD_DEFAULT for 0 where appropriate. 
Originally committed as revision 22787 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-02 23:08:23 +00:00
Stefano Sabatini
458b062d61 Implement cmdutils.c:read_file(), and use it in ffmpeg.c for reading 
the second pass encoding log file.

Originally committed as revision 22769 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-01 22:34:22 +00:00
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
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
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
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
Måns Rullgård
64f6e357fd 10l: fix build without termios.h 
Originally committed as revision 22604 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-20 01:02:45 +00:00
Måns Rullgård
9a9509e6ee Register atexit handler only when needed 
Originally committed as revision 22599 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-19 16:25:11 +00:00
Anton Khirnov
7a39f142a8 ffmpeg.c: copy chapters by default. 
Patch by Anton Khirnov wyskas gmail com

Originally committed as revision 22598 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-19 07:44:38 +00:00
Ronald S. Bultje
562f22a699 Typo: if output (video) stream's pix_fmt is not set, then the stream cannot 
be ENcoded, not DEcoded.

Originally committed as revision 22566 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-16 15:48:48 +00:00
Michael Niedermayer
802323508c Allow mpeg style yuv in jpeg when strict standard compliance is small enough. 
Originally committed as revision 22553 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-15 19:45:57 +00:00