summaryrefslogtreecommitdiff
path: root/libavdevice/alsa-audio.h
Commit message (Collapse)AuthorAge
* lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.hStefano Sabatini2011-05-27
|
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-05-26
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * ALSA: add channels and sample_rate private options.Anton Khirnov2011-05-25
| |
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | ALSA: implement channel layout for playback.Nicolas George2011-03-26
|/ | | | | | | | Currently, only S16 quad, 5.1 and 7.1 are implemented. Implementing support for other formats/layouts and capture should be straightforward. 7.1 support by Carl Eugen Hoyos.
* Define macro AV_NE() and use it in libavdevice.Stefano Sabatini2010-08-17
| | | | | | Help further refactoring. Originally committed as revision 24814 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix grammar errors in documentationMåns Rullgård2010-06-30
| | | | Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove explicit filename from Doxygen @file commands.Diego Biurrun2010-04-20
| | | | | | | | Passing an explicit filename to this command is only necessary if the documentation in the @file block refers to a file different from the one the block resides in. Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Replace WORDS_BIGENDIAN with HAVE_BIGENDIANMåns Rullgård2009-07-26
| | | | Originally committed as revision 19508 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Cosmetics: Split long line.Carl Eugen Hoyos2009-04-14
| | | | Originally committed as revision 18516 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix two icc warnings #188: enumerated type mixed with another type.Carl Eugen Hoyos2009-04-14
| | | | Originally committed as revision 18515 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add necessary #includes to pass 'make checkheaders'.Diego Biurrun2009-02-02
| | | | Originally committed as revision 16933 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use full internal pathname in doxygen @file directives.Diego Biurrun2009-02-01
| | | | | | | Otherwise doxygen complains about ambiguous filenames when files exist under the same name in different subdirectories. Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add ALSA support in libavdevice.Nicolas George2009-01-26
Patch by Nicolas George: name surname normalesup org Original thread: [FFmpeg-devel] [PATCH] ALSA for libavdevice Date: 12/09/2008 07:17 PM Originally committed as revision 16800 to svn://svn.ffmpeg.org/ffmpeg/trunk
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-11 02:00:37 +0000