summaryrefslogtreecommitdiff
path: root/libavdevice/Makefile
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-24
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (23 commits) aacenc: Fix identification padding when the bitstream is already aligned. aacenc: Write correct length for long identification strings. aud: remove unneeded field, audio_stream_index from context aud: fix time stamp calculation for ADPCM IMA WS aud: simplify header parsing aud: set pts_wrap_bits to 64. cosmetics: indentation aud: support Westwood SND1 audio in AUD files. adpcm_ima_ws: fix stereo decoding avcodec: add a new codec_id for CRYO APC IMA ADPCM. vqa: remove unused context fields, audio_samplerate and audio_bits vqa: clean up audio header parsing vqa: set time base to frame rate as coded in the header. vqa: set packet duration. vqa: use 1/sample_rate as the audio stream time base vqa: set stream start_time to 0. lavc: postpone the removal of AVCodecContext.request_channels. lavf: postpone removing av_close_input_file(). lavc: postpone removing old audio encoding and decoding API avplay: remove the -er option. ... Conflicts: Changelog libavcodec/version.h libavdevice/v4l.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavd: remove deprecated v4l grab device.Anton Khirnov2012-01-24
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ulti: Fix invalid reads lavf: dealloc private options in av_write_trailer yadif: support 10bit YUV vc1: mark with ER_MB_ERROR bits overconsumption lavc: introduce ER_MB_END and ER_MB_ERROR error_resilience: use the ER_ namespace build: move inclusion of subdir.mak to main subdir loop rv34: NEON optimised 4x4 dequant rv34: move 4x4 dequant to RV34DSPContext aacdec: Use intfloat.h rather than local punning union. Conflicts: libavcodec/h264.c libavcodec/vc1dec.c libavfilter/vf_yadif.c libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: move inclusion of subdir.mak to main subdir loopMans Rullgard2011-12-13
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * pulse: introduce pulseaudio inputLuca Barbato2011-10-26
| | | | | | | | | | | | | | It currently use the simple api and is using the latency information provided only to offset the stream start. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge remote-tracking branch 'luzero/pulse'Michael Niedermayer2011-10-22
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * luzero/pulse: pulse: cosmetics pulse: introduce pulseaudio input Conflicts: Changelog configure libavdevice/Makefile libavdevice/alldevices.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | pulse: introduce pulseaudio inputLuca Barbato2011-10-19
| | | | | | | | | | | | | | | It currently use the simple api and is using the latency information provided only to offset the stream start.
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-22
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (35 commits) flvdec: Do not call parse_keyframes_index with a NULL stream libspeexdec: include system headers before local headers libspeexdec: return meaningful error codes libspeexdec: cosmetics: reindent libspeexdec: decode one frame at a time. swscale: fix signed shift overflows in ff_yuv2rgb_c_init_tables() Move timefilter code from lavf to lavd. mov: add support for hdvd and pgapmetadata atoms mov: rename function _stik, some indentation cosmetics mov: rename function _int8 to remove ambiguity, some indentation cosmetics mov: parse the gnre atom mp3on4: check for allocation failures in decode_init_mp3on4() mp3on4: create a separate flush function for MP3onMP4. mp3on4: ensure that the frame channel count does not exceed the codec channel count. mp3on4: set channel layout mp3on4: fix the output channel order mp3on4: allocate temp buffer with av_malloc() instead of on the stack. mp3on4: copy MPADSPContext from first context to all contexts. fmtconvert: port float_to_int16_interleave() 2-channel x86 inline asm to yasm fmtconvert: port int32_to_float_fmul_scalar() x86 inline asm to yasm ... Conflicts: libavcodec/arm/h264dsp_init_arm.c libavcodec/h264.c libavcodec/h264.h libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_ps.c libavcodec/h264dsp_template.c libavcodec/h264idct_template.c libavcodec/h264pred.c libavcodec/h264pred_template.c libavcodec/x86/h264dsp_mmx.c libavdevice/Makefile libavdevice/jack_audio.c libavformat/Makefile libavformat/flvdec.c libavformat/flvenc.c libavutil/pixfmt.h libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Move timefilter code from lavf to lavd.Anton Khirnov2011-10-21
| |/ | | | | | | | | | | It's only used in the JACK device. Fixes linking shared lavd with JACK enabled.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavfi: add select filter oggdec: fix out of bound write in the ogg demuxer movenc: create an alternate group for each media type lavd: add libcdio-paranoia input device for audio CD grabbing rawdec: refactor private option for raw video demuxers pcmdec: use unique classes for all pcm demuxers. rawdec: g722 is always 1 channel/16kHz Conflicts: Changelog configure doc/filters.texi libavdevice/avdevice.h libavfilter/avfilter.h libavfilter/vf_select.c tests/ref/lavf/mov Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavd: add libcdio-paranoia input device for audio CD grabbingAnton Khirnov2011-09-17
| |
* | lavdev: add libavfilter virtual input deviceStefano Sabatini2011-08-11
| | | | | | | | | | This input device is to be considered still experimental, only video output is supported.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (21 commits) swscale: Add Doxygen for hyscale_fast/hScale. fate: enable lavfi-pixmt tests on big endian systems PPC: swscale: disable altivec functions for unsupported formats fate: merge identical pixdesc_be/le tests swscale: Add Doxygen for yuv2planar*/yuv2packed* functions. build: call texi2pod.pl with full path instead of symlink build: include sub-makefiles using full path instead of symlinks swscale: update big endian reference values after dff5a835. wavpack: skip blocks with no samples cosmetics: remove outdated comment that is no longer true build: replace some addprefix/addsuffix with substitution refs avutil: Remove unused arbitrary precision integer code. configure: Drop check for availability of ten assembler operands. aacenc: Save channel configuration for later use. aacenc: Fix codebook trellising for zeroed bands. swscale: change prototypes of scaled YUV output functions. swscale: re-add support for non-native endianness. swscale: disentangle yuv2rgbX_c_full() into small functions. swscale: split yuv2packed[12X]_c() remainders into small functions. swscale: split yuv2packedX_altivec in smaller functions. ... Conflicts: Makefile configure libavcodec/x86/dsputil_mmx.c libavfilter/Makefile libavformat/Makefile libavutil/integer.c libavutil/integer.h libswscale/swscale.c libswscale/swscale_internal.h libswscale/x86/swscale_template.c tests/ref/lavfi/pixdesc_le tests/ref/lavfi/pixfmts_scale Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: include sub-makefiles using full path instead of symlinksMans Rullgard2011-06-28
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | lavdev: add openal input deviceJonathan Baldwin2011-06-27
| |
* | Revert "build: Remove redundant config.mak includes from subdirectory ↵Reimar Döffinger2011-06-26
| | | | | | | | | | | | Makefiles." This reverts commit a6213f3dce4006e0d47bd938e15832987d95efef.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ARM: silence some annoying armcc warnings ffplay: Remove unused-but-set channels variable from update_sample_display(). build: Add DEP_LIBS dependency directly to the shared library build rule. build: Remove multiple inclusion guards from config.mak. build: Remove redundant config.mak includes from subdirectory Makefiles. aacenc: Mark psy_3gpp_window() as av_unused. Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Remove redundant config.mak includes from subdirectory Makefiles.Diego Biurrun2011-06-25
| | | | | | | | | | Calling Make from subdirectories is not supported and config.mak has multiple inclusion guards anyway, so the top-level include is enough.
| * framebuffer device demuxerStefano Sabatini2011-03-28
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | lavdev: add SDL output deviceStefano Sabatini2011-05-28
| |
* | DirectShow capture supportRamiro Polla2011-05-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-28
|\| | | | | | | | | | | | | | | | | | | | | | | | | * newdev/master: ac3enc: Add codec-specific options for writing AC-3 metadata. NOT MERGED: Remove arrozcru URL from documentation sndio support for playback and record Conflicts: doc/faq.texi doc/general.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * sndio support for playback and recordBrad2011-03-27
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * Merge libavcore into libavutilReinhard Tartler2011-02-15
| | | | | | | | | | | | | | | | | | | | | | | | It is pretty hopeless that other considerable projects will adopt libavutil alone in other projects. Projects that need small footprint are better off with more specialized libraries such as gnulib or rather just copy the necessary parts that they need. With this in mind, nobody is helped by having libavutil and libavcore split. In order to ease maintenance inside and around FFmpeg and to reduce confusion where to put common code, avcore's functionality is merged (back) to avutil. Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* | framebuffer device demuxerStefano Sabatini2011-03-08
| |
* | Merge libavcore into libavutilReinhard Tartler2011-02-16
|/ | | | Done to keep ABI compatible. Otherwise this is just silly
* Remove use of the deprecated function avcodec_check_dimensions(), useStefano Sabatini2010-08-06
| | | | | | av_check_image_size() instead. Originally committed as revision 24711 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove broken BeOS audio interface.Diego Biurrun2010-06-10
| | | | Originally committed as revision 23568 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Split avdevice.c off from alldevices.c.Diego Biurrun2009-11-18
| | | | | | alldevices.c is not a good place for avdevice_version(). Originally committed as revision 20546 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: Break overly long lines.Diego Biurrun2009-10-18
| | | | Originally committed as revision 20276 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Skip headers requiring external libs not present in checkheadersMåns Rullgård2009-08-23
| | | | Originally committed as revision 19685 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make the configure script select the input/output devices usingStefano Sabatini2009-06-29
| | | | | | | --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
* Implement JACK input device.Olivier Guilyardi2009-04-02
| | | | | | | Patch by Olivier Guilyardi list samalyse com. See the thread: "[FFmpeg-devel] [PATCH] libavdevice: JACK demuxer". Originally committed as revision 18322 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
* Rename audio.c to oss_audio.c in libavdevice.Benoit Fouet2009-01-21
| | | | Originally committed as revision 16707 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use OBJS variable for all object filesMåns Rullgård2008-10-25
| | | | | | | There is no longer any need to differentiate the object files by source type. Originally committed as revision 15708 to svn://svn.ffmpeg.org/ffmpeg/trunk
* prettyprinting cosmeticsDiego Biurrun2008-05-08
| | | | Originally committed as revision 13077 to svn://svn.ffmpeg.org/ffmpeg/trunk
* non-recursive makefilesMåns Rullgård2008-04-07
| | | | Originally committed as revision 12760 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix building with C++ objects, variable names were inconsistent.François Revol2008-03-27
| | | | Originally committed as revision 12608 to svn://svn.ffmpeg.org/ffmpeg/trunk
* VFW capture supportRamiro Polla2008-03-08
| | | | Originally committed as revision 12384 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: Consistently move NAME and FFLIBS to the top of each Makefile.Diego Biurrun2008-03-08
| | | | Originally committed as revision 12364 to svn://svn.ffmpeg.org/ffmpeg/trunk
* simplify library version handlingMåns Rullgård2008-03-07
| | | | Originally committed as revision 12362 to svn://svn.ffmpeg.org/ffmpeg/trunk
* consolidate CFLAGS, LDFLAGS, EXTRALIBS assignmentMåns Rullgård2008-03-06
| | | | Originally committed as revision 12354 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Link to libraries in dependency order.Víctor Paesa2008-01-12
| | | | | | Based on a patch by Gonzalo Garramuño, ggarra advancedsl com ar Originally committed as revision 11515 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Link libavdevice against libavutil, libavcodec, and libavformatLuca Abeni2007-11-23
| | | | | | (fix compilation for non-ELF targets). Originally committed as revision 11085 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Introduce libavdeviceLuca Abeni2007-11-22
Originally committed as revision 11077 to svn://svn.ffmpeg.org/ffmpeg/trunk