RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
101,645 Commits 36 Branches 392 Tags 304 MiB
Commit Graph

75 Commits

Author SHA1 Message Date
Anton Khirnov 2e0e1e712a libdc1394: add a pixel_format private option. 2011-05-27 23:33:51 +02:00
Martin Lambers b8773e44d5 libdc1394: choose best video mode and rate based on camera capabilities. 2011-05-27 16:55:07 +02:00
Martin Lambers ea7e318fb2 Remove support for libdc1394 < 2.0. 
Versions >= 2.0 have been around for a very long time now.
 2011-05-27 16:55:07 +02:00
Stefano Sabatini 6b899e16de lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.h 2011-05-27 12:15:09 +02:00
Anton Khirnov fd48620e3e libdc1394: add video_size private option. 2011-05-27 06:52:51 +02:00
Anton Khirnov 284bac2e77 libdc1394: return meaninful error codes. 2011-05-27 06:52:51 +02:00
Michael Niedermayer 027264cb82 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (31 commits)
  ARM: add ARMv6 optimised av_clip_uintp2
  ARM: remove volatile from asm statements in libavutil/intmath
  ARM: fix av_clipl_int32_arm()
  v4l: include avdevice.h
  ffserver: move close_connection() call to avoid a temporary string and copy.
  lavf: initialize demuxer private options.
  AVOptions: set string default values.
  lavdevice: mark v4l for removal on next major bump.
  swscale: fix compile on ppc.
  swscale: fix compile on x86-32.
  build: Remove generated .version file on distclean.
  configure: Add -D_GNU_SOURCE to CPPFLAGS on OS/2.
  doc: Drop hint at --enable-memalign-hack for MinGW, it is now autodetected.
  ffplay: Remove disabled code.
  Mark parameterless function declarations as 'void'.
  swscale: use av_clip_uint8() in yuv2yuv1_c().
  swscale: remove VOF/VOFW.
  swscale: split chroma buffers into separate U/V planes.
  swscale: replace formatConvBuffer[VOF] by allocated array.
  rgb2rgb: remove duplicate mmx/mmx2/3dnow/sse2 functions.
  ...

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-27 02:53:21 +02:00
Anton Khirnov 2341c97e8d libdc1394: fix compilation. 
Add a forgotten comma and move options/class definition outside of
HAVE_LIBDC1394_1.
 2011-05-26 09:23:56 +02:00
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
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
Mans Rullgard 2912e87a6c Replace FFmpeg with Libav in licence headers 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-19 13:33:20 +00:00
Diego Elio Pettenò 66355be3c3 Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice. 
This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts.
(cherry picked from commit c6610a216e)
 2011-01-28 03:15:34 +01:00
Diego Elio Pettenò c6610a216e Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice. 
This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts.
 2011-01-26 22:10:09 +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
Aurelien Jacobs 49fb20cb8a replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_ 
and remove all ENABLE_ definitions.

Originally committed as revision 16600 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-14 17:19:17 +00:00
Diego Biurrun ca74c0a180 cosmetics: Fix two common typos: wont --> will not, lets --> let us. 
Originally committed as revision 14372 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-24 17:09:28 +00:00
Stefano Sabatini bde15e74de Make long_names in lavf/lavdev optional depending on CONFIG_SMALL. 
patch by Stefano Sabatini, stefano.sabatini-lala poste.it
along with some spelling/consistency fixes for the long names by me

Originally committed as revision 13649 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-03 16:20:54 +00:00
Diego Biurrun 245976da2a Use full path for #includes from another directory. 
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-09 11:56:36 +00:00
Diego Biurrun 63d026b1bf cosmetics: #include config.h before all other FFmpeg headers. 
Originally committed as revision 12450 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-15 16:17:02 +00:00
Alessandro Sappia cbe3f0b8ec Enabling higher frame rates for dc1394, patch by Alessandro Sappia a dot sappia at ngi dot it 
Originally committed as revision 11502 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-11 02:13:32 +00:00
Alessandro Sappia 0b4a18218e Adding support for libdc1394 v.2, patch by Alessandro Sappia a dot sappia at ngi dot it 
Originally committed as revision 11501 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-11 01:59:05 +00:00
Roman Shaposhnik 43d1a1c05a * fixing a bug preventing default values to be set correctly 
Originally committed as revision 11461 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-08 02:52:05 +00:00
Luca Abeni c721d803cb Introduce libavdevice 
Originally committed as revision 11077 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-22 16:10:02 +00:00