xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-24 12:09:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
25,737 Commits 31 Branches 338 Tags 298 MiB
c0ec9918b0
Commit Graph

955 Commits

Author SHA1 Message Date
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
Alexander Strange
d55065a29f ffmpeg: Combine variable declaration and definition 
Originally committed as revision 22537 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-15 02:33:49 +00:00
Alexander Strange
47b229dbab ffmpeg: Factor out redundant sync_ipts calculation 
Originally committed as revision 22536 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-15 02:32:21 +00:00
Måns Rullgård
335ee1aadd Move libm replacements to new header libm.h 
ffmpeg.c uses lrintf(), which is missing on some systems.  Previously
it picked up the replacement via libavutil/internal.h due to
HAVE_AV_CONFIG_H being erroneously defined.

Moving these replacements to a separate header enables ffmpeg.c to
use them without being exposed to internal interfaces.

This use of a non-public header is justified by the header in question
not being part of the internal interface either.  It should rather be
considered as part of the build system, which is shared between the
libraries and the applications.

This header cannot be installed since the tested conditions depend on
the compiler.

Originally committed as revision 22399 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-09 15:10:23 +00:00
Måns Rullgård
6580d5e377 Remove hacks not required since HAVE_AV_CONFIG_H was unset for the apps 
Originally committed as revision 22295 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-07 22:18:37 +00:00
Alex Converse
660822f0ae ffmpeg.c: Don't use NULL for integer metadata flags. 
Originally committed as revision 22205 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-04 11:27:39 +00:00
Stefano Sabatini
8c8bf9ecfc Make ffmpeg print a message and abort if the name of the format 
provided with -f was unknown.

Originally committed as revision 22140 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-02 00:01:16 +00:00
Chris Stones
49b609820d Don't let output pixel format influence input pixel format. 
Patch by Chris Stones,  chris D stones A gmail

Originally committed as revision 22130 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-01 16:47:44 +00:00
Anton Khirnov
c71591a509 ffmpeg: copy stream metadata. 
Patch by Anton Khirnov wyskasgmailcom

Originally committed as revision 22126 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-01 07:22:59 +00:00
Francesco Cosoleto
6abda15f56 Prevent overflow of start_time + recording_time. 
Patch by Francesco Cosoleto gmail($name)

Originally committed as revision 22077 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-26 14:46:20 +00:00
Michael Niedermayer
a15fdd7ce3 Attempt to fix issue1728 and regression of issue203 
Originally committed as revision 22011 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-23 23:41:11 +00:00
Michael Niedermayer
b8c93c483b Set ist->pts to something that isnt guranteed to entangle itself with stream copying b frames. 
Originally committed as revision 22010 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-23 22:06:36 +00:00
Michael Niedermayer
247e3954fc Favor streams with more packets if the user did not specify what she wants. 
Fixes issue1156

Originally committed as revision 22002 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-23 16:31:14 +00:00
Michael Niedermayer
6d3d3b836f Redesign opt_programid code. 
Its now possible to also select programs per input file and there is
less code duplication.

Originally committed as revision 21999 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-23 15:08:41 +00:00
Reimar Döffinger
fc5607f862 Make -benchmark also print the maximum memory usage if possible. 
Originally committed as revision 21973 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-22 22:21:58 +00:00
Wolfram Gloger
23b361baca Remove recording_time check which is no longer necessary after r21687. 
Patch by Wolfram Gloger, wmglo A dent D med D uni-muenchen D de

Originally committed as revision 21760 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-11 21:54:09 +00:00
Reimar Döffinger
40938d9382 Use av_compare_ts to compare against the -t end time instead of using 
floating point.
Should fix different results between PPC and x86 for the idroq-video-encode
FATE test.

Originally committed as revision 21745 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-10 19:46:44 +00:00
Wolfram Gloger
55a7e946f6 Stop reading input file when -t option value is reached. 
Patch by Wolfram Gloger wmglo (chez) dent med uni (minus) muenchen de

Originally committed as revision 21687 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-08 09:04:06 +00:00
Justin Johnson
86a4f011e6 Revert r21615 | cehoyos | 2010-02-02 23:23:09 +0100 (Tue, 02 Feb 2010) | 5 lines 
Guess the duration before converting video and write guessed duration
	into flv header.
	Patch by Justin Johnson, justin D johnson3 A gmail

The change to ffmpeg.c is wrong as input and output files arent connected 1:1
(i seem to have missed that)
Also it can segfault see ([FFmpeg-devel] rtp streaming x264+audio issues (and some ideas to fix them))

Originally committed as revision 21652 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-06 11:11:10 +00:00
Stefano Sabatini
6e2fdc3eb1 Add parentheses in boolean expression: (A && B || C) => ((A && B) || C), 
fix the warning:
ffmpeg.c: In function ‘output_packet’:
ffmpeg.c:1317: warning: suggest parentheses around && within ||

Originally committed as revision 21650 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-06 00:10:42 +00:00
Stefano Sabatini
cedac88250 Make opt_frame_pix_fmt() call show_pix_fmts() if the provided option 
is "list".

Originally committed as revision 21628 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-03 19:55:45 +00:00
Michael Niedermayer
f575f08ccb Correct opts calulation in ffmpeg.c. 
This correct the stop point for demuxing with -vcodec copy and -t as well as
packet interleaving. (we already diddrop packets but kept demuxing them
for too long due to opts being wrong)
the change to ffm is due to 2 packets with timestamp 0 being stored
in different order.

Originally committed as revision 21626 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-03 15:09:04 +00:00
Michael Niedermayer
5bfe91e683 Alternative solution for the mpegvideo_split + mov problem. 
Originally committed as revision 21625 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-03 14:53:14 +00:00
Justin Johnson
c5e1e9827d Guess the duration before converting video and write guessed duration 
into flv header.

Patch by Justin Johnson, justin D johnson3 A gmail

Originally committed as revision 21615 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-02 22:23:09 +00:00
Michael Niedermayer
f8ccf72005 Check pkt.pts against the recording time. 
This fixes at least ogg encoding with -t where the file was slightly too long.

Originally committed as revision 21598 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-01 22:08:45 +00:00
Stefano Sabatini
718c7b18c9 Use av_get_pix_fmt() instead of the deprecated avcodec_get_pix_fmt() 
function.

Originally committed as revision 21550 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-30 19:10:26 +00:00
Jai Menon
ecc544debd ffmpeg.c : Don't set AVFormatParameters::[audio|video]_codec_id 
since it is no longer required.

Originally committed as revision 21513 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-28 16:17:52 +00:00
Jai Menon
60402344af ffmpeg.c : Increase static limit on the maximum number of 
input files.

Originally committed as revision 21483 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-27 19:11:31 +00:00
Michael Niedermayer
3ff0daf06d Print "Multiple frames in a packet" warning independant of CODEC_CAP_SUBFRAMES 
because CODEC_CAP_SUBFRAMES is primarely misused to hide this warning otherwise
which renders the flag completely useless.

Originally committed as revision 21480 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-27 13:27:18 +00:00
Michael Niedermayer
7a086a852c Fix heap overflow with -async. 
Fixes issue1666

Originally committed as revision 21390 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-23 01:25:19 +00:00
Måns Rullgård
40ccc754e9 Indent 
Originally committed as revision 21359 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-20 22:55:55 +00:00
Måns Rullgård
68cf92ee5e Always call avcodec_thread_init() 
The various avcodec_thread_init() functions are updated to return
immediately after setting avctx->thread_count.  This allows -threads 0
to pass through to codecs.  It also simplifies the usage for apps
using libavcodec.

Originally committed as revision 21358 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-20 22:55:50 +00:00
Måns Rullgård
ffcc6e24f5 Add -timelimit option 
This option limits the CPU time used by ffmpeg to the number of seconds
specified.  After this time, the OS sends a SIGXCPU signal, which we
handle and attempt to exit cleanly.  If the process is stuck, the OS
will deliver a SIGKILL one second later, forcibly terminating the
process.

This functionality is useful in automated setups where a runaway ffmpeg
process would otherwise go undetected.

Originally committed as revision 21347 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-20 06:42:39 +00:00
Michael Niedermayer
036c1382a7 Fix stream copy & transcoding one stream at the same time. 
Fixes issue1660.

Originally committed as revision 21042 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-07 01:15:16 +00:00
Michael Niedermayer
9f907d853f Correct indention. 
Originally committed as revision 21041 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-07 00:50:34 +00:00
Michael Niedermayer
8157483d64 Move the definitions of data_buf and data_size closer to where they are used. 
Originally committed as revision 21040 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-07 00:47:23 +00:00
Stefano Sabatini
0f52ef1a00 Use av_guess_format() in place of the deprecated guess_format(). 
Originally committed as revision 20994 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-01 12:58:03 +00:00
Michael Dorr
322aa1e2d8 Do not explicitely set thread_count in the codec context. 
This is already done by avcodec_thread_init().

Patch by Michael Dorr <dorr <at> inb.uni-luebeck.de>.

Originally committed as revision 20955 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-28 22:46:46 +00:00
Michael Niedermayer
37ce3d6ba7 Do not copy codec_tag in stream copy case if it is associated with a different codec_id 
fixes issue1568

Originally committed as revision 20921 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-25 21:01:16 +00:00
Stefano Sabatini
a6831e885c Use positive logic, improve readability, consistent with r20877. 
Originally committed as revision 20920 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-25 18:32:16 +00:00
Ramiro Polla
7f11e745b2 Print usage instead of help when no files are specified. 
Originally committed as revision 20905 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-21 02:15:46 +00:00
Ramiro Polla
0c2a18cbcd Split show_usage() out of show_help(). 
Originally committed as revision 20904 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-21 02:12:34 +00:00
Ramiro Polla
8319aefeec Add a general [options] to the basic usage string. 
Originally committed as revision 20903 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-21 02:10:14 +00:00
Ramiro Polla
27daa420fc First print the program description and then the basic usage line. 
Originally committed as revision 20902 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-21 02:09:17 +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
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
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
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
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
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
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
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
Michael Niedermayer
e185a2f649 Do as the comment says and signal an error. 
Originally committed as revision 20770 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-08 14:50:46 +00:00
Michael Niedermayer
b8919a3092 10l bug, use av_fast_malloc() instead if av_malloc() for allocating audio 
buffers.
This and the previous revision fix a heap overflow.

Originally committed as revision 20769 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-08 14:48:36 +00:00
Michael Niedermayer
15bfe412b7 Try to allocate audio buffer sizes depending on the number of input bytes. 
Fixes issue1167.

Originally committed as revision 20768 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-08 14:28:28 +00:00
Michael Niedermayer
5ee05a62f9 Check that the buffer size speified to avcodec_encode_audio() is not larger than the actual size. 
Originally committed as revision 20767 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-08 14:18:15 +00:00
Michael Niedermayer
060b8592d2 Do not assume that av_get_bits_per_sample() is a multiple of 8. 
Originally committed as revision 20766 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-08 14:10:49 +00:00
Michael Niedermayer
80f4725060 Get rid of audio_out2, it seems unneeded. 
Originally committed as revision 20760 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-07 16:26:37 +00:00
Jai Menon
3394653306 Update frame_width and frame_height based on the lowres value. 
Fixes issues 1387, 1097 and probably some other lowres related problems.

Originally committed as revision 20741 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-05 17:51:00 +00:00
Stefano Sabatini
ef6fc64762 Add 'const' attribute to the last_asked_format variable, fix a 
compiler warning.

Originally committed as revision 20740 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-05 15:14:01 +00:00
Michael Niedermayer
b83ccbffe9 Do not crash on frame size changes. 
Fixes issue1481.

Originally committed as revision 20730 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-04 16:20:00 +00:00
Ramiro Polla
15e65f83ec Update help text for -fpre option to make it a little less confusing. 
Originally committed as revision 20713 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-03 00:55:52 +00:00
Stefano Sabatini
992f8eaee7 Factorize common commandline options definition. 
Originally committed as revision 20664 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-29 23:12:19 +00:00
Michael Niedermayer
bc7eb330e3 Remove "frame size must be a multiple of 2" check. 
This check only caught explicitly set sizes from the cmd line and overriding
the users wish seems silly, especially as it seems to work.

Originally committed as revision 20634 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-27 20:20:44 +00:00
Michael Niedermayer
9ff261a2b2 Remove special case that changed video sync behavior for av_q2d(enc->time_base) <= 0.001. 
This should make the default behave more like one would expect and not
change behavior at 1000fps.

Originally committed as revision 20615 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-25 23:33:47 +00:00
Michael Niedermayer
8447f0bd74 Split show_formats(). 
Originally committed as revision 20553 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-19 16:35:55 +00:00
Ramiro Polla
200267333c Indent. 
Originally committed as revision 20436 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-02 23:44:11 +00:00
Ramiro Polla
a75e103432 Add -fpre option to take a preset file as parameter. The -[avs]pre options no 
longer accept filenames, and -fpre should be used instead.

Originally committed as revision 20435 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-02 23:41:54 +00:00
Etienne Buira
a5abfd8fd1 Issue an error when forced format cannot be honored. 
Patch by Etienne Buira $name $surname lists chez free.fr

Originally committed as revision 20417 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-30 09:57:34 +00:00
Stefano Sabatini
43d160fd00 Prefer "loglevel" over "logging level number or string" as argname of 
the loglevel command line option.

Make the loglevel option help message more clear, since the option
argument is shown as a single token, and make the whole message better
aligned with the other help messages.

Originally committed as revision 20149 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-02 19:06:27 +00:00
Sascha Sommer
d859bb1db0 Add CODEC_CAP_SUBFRAMES for codecs that output multiple subframes 
per AVPacket
No longer print "Multiple frames in a packet" error message
when CODEC_CAP_SUBFRAMES is set (wmapro, wavpack)

Originally committed as revision 19881 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-16 15:08:26 +00:00
Sascha Sommer
9d66ef18fa fix PTS calculation for audio formats with bits per sample != 16 
Originally committed as revision 19880 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-16 12:45:24 +00:00
Ramiro Polla
7ef618796a Check for return value of some context allocations. 
Originally committed as revision 19826 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-12 17:22:56 +00:00
Reimar Döffinger
7f4fca038d Increase maximum encoded subtitle size from 64 kB to 1 MB. 
Fixes "dvd_subtitle too big" errors when encoding HD video subtitles
to DVD format.

Originally committed as revision 19713 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-26 10:22:27 +00:00
Reimar Döffinger
8b03c014f0 Make sure that start_display_time is 0 by moving its value onto pts. 
If it was not 0, subtitle encoding would fail.

Originally committed as revision 19710 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-26 08:43:11 +00:00
Reimar Döffinger
266649a52f 100l, error out if subtitle encoder failed instead of writing an AVPacket 
with ridiculous size and thus crashing.

Originally committed as revision 19641 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-15 00:37:31 +00:00
Diego Biurrun
966116b9f7 Remove some hunks of unused and disabled code cruft. 
Originally committed as revision 19606 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-07 14:53:31 +00:00
Martin Storsjö
e9a832e508 Change type of received_sigterm variable from sig_atomic_t to int, 
which is more portable (works on Windows CE).
patch by Martin Storsjö, martin martin st

Originally committed as revision 19515 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-27 13:01:44 +00:00