videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity
30,261 Commits 36 Branches 392 Tags 195 MiB
Commit Graph

30261 Commits

Author SHA1 Message Date
Michael Niedermayer 39e4206dc6 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (32 commits)
  doc: create separate section for audio encoders
  swscale: Remove orphaned, commented-out function declaration.
  swscale: Eliminate rgb24toyv12_c() duplication.
  Remove h263_msmpeg4 from MpegEncContext.
  APIchanges: Fill in git hash for fps_probe_size (30315a8)
  avformat: Add fpsprobesize as an AVOption.
  avoptions: Return explicitly NAN or {0,0} if the option isn't found
  rtmp: Reindent
  rtmp: Don't try to do av_malloc(0)
  tty: replace AVFormatParameters.sample_rate abuse with a private option.
  Fix end time of last chapter in compute_chapters_end
  ffmpeg: get rid of useless AVInputStream.nb_streams.
  ffmpeg: simplify managing input files and streams
  ffmpeg: purge redundant AVInputStream.index.
  lavf: deprecate AVFormatParameters.channel.
  libdc1394: add a private option for channel.
  dv1394: add a private option for channel.
  v4l2: reindent.
  v4l2: add a private option for channel.
  lavf: deprecate AVFormatParameters.standard.
  ...

Conflicts:
	doc/APIchanges
	doc/encoders.texi
	ffmpeg.c
	libavdevice/alsa-audio.h
	libavformat/version.h
	libavutil/opt.c
	libswscale/rgb2rgb.h
	libswscale/rgb2rgb_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-26 03:28:22 +02:00
Michael Niedermayer 189db9c982 ffv1: fix 16bits multithreading 
fixes ticket237

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-26 01:55:12 +02:00
Stefano Sabatini a2ee2843c0 doc: create separate section for audio encoders 
Having a separate section for audio encoders simplifies navigation
and is slightly more consistent with the rest of the manual.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-05-26 01:23:43 +02:00
Diego Biurrun 6f7a280ead swscale: Remove orphaned, commented-out function declaration. 2011-05-26 00:56:07 +02:00
Michael Niedermayer 7dc303a60e swscale: Eliminate rgb24toyv12_c() duplication. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-05-26 00:56:06 +02:00
ami_stuff feae7ad2f8 mpegvideo_enc: use AV_LOG_ERROR instead of AV_LOG_INFO for two error messages 
use AV_LOG_ERROR instead of AV_LOG_INFO for two error messages

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-25 23:51:52 +02:00
ami_stuff 7a54edaa16 Fail when lowres value is lower than 0 
The attached patch fixes the crash which happens when user passes lowres value lower than 0 to FFplay.

ffplay -lowres -1 test.mpg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-25 23:42:56 +02:00
Alex Converse 8c51620f21 Remove h263_msmpeg4 from MpegEncContext. 
It was long ago superseded by msmpeg4_version.
 2011-05-25 13:24:25 -07:00
Alex Converse 19a686b8a3 APIchanges: Fill in git hash for fps_probe_size (30315a8) 2011-05-25 12:36:41 -07:00
Alex Converse 30315a8d9c avformat: Add fpsprobesize as an AVOption. 2011-05-25 12:34:46 -07:00
Michael Niedermayer b49728df73 swscale: document SWS_CPU_CAPS* 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-25 21:04:44 +02:00
Michael Niedermayer e92bdadb2d Revert removial of SWS flags from e66149e714 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-25 21:03:26 +02:00
Martin Storsjö 80068da3a0 avoptions: Return explicitly NAN or {0,0} if the option isn't found 
This actually matches what av_get_double did earlier, the
0.0/0.0 division was intentional, for producing NAN.

Still keeping the check for the return value from
av_get_number, for clarity.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-05-25 22:01:33 +03:00
Martin Storsjö 48b1fb1397 rtmp: Reindent 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-05-25 22:01:21 +03:00
Martin Storsjö 271c869cc3 rtmp: Don't try to do av_malloc(0) 
Some received packets can have size 0. The return value from
av_malloc(0) may be NULL, which is ok if the size was 0. On
OS X, however, the returned pointer is non-null but leads to
crashes when trying to free it.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-05-25 22:00:42 +03:00
Michael Niedermayer 4a056160be swscale: remove duplicatiopn of rgb24toyv12_c() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-25 20:58:59 +02:00
Jean-Tiare Le Bigot 364889cf9c Return -1 on invalid input instead of crashing. 2011-05-25 20:12:17 +02:00
Stefano Sabatini b8e3b74147 vf_mp: fix name of the remove-logo filter referenced in filters.texi 
Correct the name from "remove_logo" to "remove-logo".
 2011-05-25 18:29:55 +02:00
Anton Khirnov 67540af7ba tty: replace AVFormatParameters.sample_rate abuse with a private option. 2011-05-25 16:21:25 +02:00
John Stebbins 656566d7a4 Fix end time of last chapter in compute_chapters_end 
Parenthesis are misplaced in calculation of max_time.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-05-25 15:55:48 +02:00
Anton Khirnov 2cf8355f98 ffmpeg: get rid of useless AVInputStream.nb_streams. 
It's a duplicate of AVFormatContext.nb_streams.
 2011-05-25 15:55:47 +02:00
Anton Khirnov 07633154ad ffmpeg: simplify managing input files and streams 
Grow the file and stream list in opt_input_file() instead of creating it
all at once in transcode().  This is simpler and will be useful for
following commits.
 2011-05-25 15:55:47 +02:00
Anton Khirnov d2bc4da15b ffmpeg: purge redundant AVInputStream.index. 
AVStream.index stores the same thing.
 2011-05-25 15:55:47 +02:00
Anton Khirnov d20576d01b lavf: deprecate AVFormatParameters.channel. 2011-05-25 15:55:47 +02:00
Anton Khirnov 79405e57dc libdc1394: add a private option for channel. 2011-05-25 15:55:47 +02:00
Anton Khirnov 986f4f4918 dv1394: add a private option for channel. 2011-05-25 15:55:47 +02:00
Anton Khirnov 3d2a418605 v4l2: reindent. 2011-05-25 15:55:47 +02:00
Anton Khirnov a02fd06ab7 v4l2: add a private option for channel. 2011-05-25 15:55:47 +02:00
Anton Khirnov fc68a8f703 lavf: deprecate AVFormatParameters.standard. 2011-05-25 15:55:47 +02:00
Anton Khirnov b3da269211 v4l2: add a private option for video standard. 2011-05-25 15:55:46 +02:00
Anton Khirnov a861ffeffa v4l: add a private option for video standard. 2011-05-25 15:55:46 +02:00
Anton Khirnov eb040dbbd3 dv1394: add a private option for video standard. 2011-05-25 15:55:46 +02:00
Anton Khirnov e199eb44fd bktr: add a private option for video standard. 2011-05-25 15:55:46 +02:00
Anton Khirnov bffd4dd1d3 lavf: deprecate AVFormatParameters.{channels,sample_rate}. 2011-05-25 15:55:46 +02:00
Anton Khirnov 5b3865fc5f rawdec: add sample_rate/channels private options. 2011-05-25 15:55:46 +02:00
Anton Khirnov 2ea8faf39f ALSA: add channels and sample_rate private options. 2011-05-25 15:20:26 +02:00
Anton Khirnov 003e63b6df oss: add channels and sample_rate private options. 2011-05-25 15:20:26 +02:00
Anton Khirnov a1a15a9993 sndio: add channels and sample_rate private options. 2011-05-25 15:20:26 +02:00
Anton Khirnov fb37d57347 lavf: deprecate AVFormatParameters.mpeg2ts_raw. 
It doesn't do anything except produce an error message when set.
 2011-05-25 15:20:25 +02:00
Anton Khirnov 17a5556db5 mpegts: add compute_pcr option. 
Deprecate the corresponding AVFormatParameters field.
 2011-05-25 15:20:25 +02:00
Anton Khirnov 5dc8214420 lavf: add priv_class field to AVInputFormat. 2011-05-25 15:20:25 +02:00
Stefano Sabatini 07586b68a8 lavfi: add select filter 
Address trac issue #92.
 2011-05-25 12:54:07 +02:00
Stefano Sabatini 3c2c52baec eval: implement not() expression 2011-05-25 12:42:19 +02:00
Stefano Sabatini cf06e3e4dd vsrc_buffer: return an error code if no frames are available 
Also decrease the log level of the corresponding message to WARNING,
since the error is not fatal.
 2011-05-25 12:42:19 +02:00
Stefano Sabatini 6b5e182540 ffmpeg: handle the case when get_filtered_frame() fails 2011-05-25 12:42:18 +02:00
Stefano Sabatini 48df6a2415 indeo3: add out-of-buffer write check 
Prevent out-of-buffer writes. In particular fix smclocki32.avi.1.1
crash, trac issue #114, roundup issue #1482.
 2011-05-25 11:29:47 +02:00
Reuben Thomas 39d983461a Add reading of disc number to mov.c 2011-05-25 11:15:56 +02:00
John Stebbins a3da17730e Fix end time of last chapter in compute_chapters_end(). 2011-05-25 09:49:18 +02:00
Carl Eugen Hoyos 06fd213eb6 Do not reset channel_layout to 0. 
The channel_layout may have been set by the demuxer.
 2011-05-25 09:49:18 +02:00
Stefano Sabatini ecf72542fa vsrc_buffer: remove duplicated file description 2011-05-25 09:37:25 +02:00