RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
31,127 Commits 37 Branches 400 Tags 256 MiB
Commit Graph

18 Commits

Author SHA1 Message Date
Stefano Sabatini 6b899e16de lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.h 2011-05-27 12:15:09 +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 bffd4dd1d3 lavf: deprecate AVFormatParameters.{channels,sample_rate}. 2011-05-25 15:55:46 +02:00
Anton Khirnov 003e63b6df oss: add channels and sample_rate private options. 2011-05-25 15:20:26 +02:00
Reimar Döffinger e76c0c6a00 Simplify: Use FFMIN. 2011-03-29 20:18:45 +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
Stefano Sabatini 4f2d2e4ed9 Define macro AV_NE() and use it in libavdevice. 
Help further refactoring.

Originally committed as revision 24814 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-17 18:25:34 +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
Stefano Sabatini bd01c39330 Make audio_read_packet() return AVERROR_EOF rather than AVERROR(EOF) = 
AVERROR(-1) = 1.

Originally committed as revision 22664 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-25 00:41:54 +00:00
Ramiro Polla 802da0b490 Indent. 
Originally committed as revision 21933 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-21 03:23:30 +00:00
Michael Niedermayer d3298350bb Do not invent error codes but pass the error code on. 
Originally committed as revision 20630 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-27 13:48:37 +00:00
Michael Niedermayer fed0c2fb71 Replace very odd and completely broken oss read_packet() by the obvious way to 
read.
Fixes issue348.

Originally committed as revision 20629 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-27 13:37:53 +00:00
Vitor Sessak 600b9c5c8c Do not do free AVStream in case of error, this is not supposed to be 
done by the demuxer.

Fix issue 1378.

Originally committed as revision 19825 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-12 16:23:13 +00:00
Måns Rullgård 63613fe615 Replace WORDS_BIGENDIAN with HAVE_BIGENDIAN 
Originally committed as revision 19508 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-26 12:20:04 +00:00
Stefano Sabatini 38e54a75ab Make the configure script select the input/output devices using 
--enable-indev, --enable-outdev rather than --enable-demuxer,
--enable-muxer as before, same for disabling them.

Originally committed as revision 19293 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-29 18:49:15 +00:00
Benoit Fouet 33054e35e3 Rename audio.c to oss_audio.c in libavdevice. 
Originally committed as revision 16707 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-21 08:43:38 +00:00