summaryrefslogtreecommitdiff
path: root/Makefile
Commit message (Collapse)AuthorAge
* Makefile: remove checkheaders from the main check targetMichael Niedermayer2012-06-29
| | | | | | | | | | checkheaders doesnt pass and noone has even noticed since a very long time. checkheaders is also unmaintained (please add yourself to MAINTAINERS if you want to maintain it) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Optimization of AMR NB and WB decoders for MIPSNedeljko Babic2012-06-11
| | | | | | | | | | | | | | | | | | | | | | | | | | AMR NB and WB decoders are optimized for MIPS architecture. Appropriate Makefiles are changed accordingly. Cnfigure script is changed in order to support optimizations. Optimizations are enabled by default when compiling is done for mips architecture. Appropriate cflags are automatically set. Support for several mips CPUs is added in configure script. New ffmpeg options are added for disabling optimizations. The FFMPEG option --disable-mipsfpu disables MIPS floating point optimizations. The FFMPEG option --disable-mips32r2 disables MIPS32R2 optimizations. The FFMPEG option --disable-mipsdspr1 disables MIPS DSP ASE R1 optimizations. The FFMPEG option --disable-mipsdspr2 disables MIPS DSP ASE R2 optimizations. Signed-off-by: Nedeljko Babic <nbabic@mips.com> Reviewed-by: Vitor Sessak <vitor1001@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* doc/examples: install them with the shared data.Clément Bœsch2012-05-19
|
* build: remove non-existant examples rule.Clément Bœsch2012-05-19
|
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-16
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: fate: Work around non-standard wc implementations at more places fate: work around non-standard wc implementations x86: rv40: Mark rv40_weight functions as MMX2; they use MMX2 instructions. ac3dsp: simplify x86 versions of ac3_max_msb_abs_int16 fate: use standard diff options tta: Fix comment about channel number; TTA supports >2 channels. avfilter: Move ff_get_ref_perms_string() to where it is used. build: Add 'check' target to run all compile and test targets. indeo3: validate new frame size before resetting decoder indeo3: when freeing buffers, set pointers referencing them to NULL as well indeo3: initialise pixel planes on allocation indeo3: ensure that decoded cell data is in 7-bit range as presumed by decoder fate: rename psx-str-v3-mdec to mdec-v3 fate: convert psx-str to a demuxer test lavf: add mdec to is_intra_only() list Conflicts: doc/developer.texi libavcodec/indeo3.c libavfilter/video.c libavformat/utils.c tests/fate/demux.mak tests/fate/video.mak tests/lavf-regression.sh tests/ref/vsynth1/cljr tests/ref/vsynth1/ffvhuff tests/ref/vsynth2/cljr tests/ref/vsynth2/ffvhuff Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Add 'check' target to run all compile and test targets.Diego Biurrun2012-05-15
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: FATE: use updated reference for aac-latm_stereo_to_51 avconv: use libavresample Add libavresample FATE: avoid channel mixing in lavf-dv_fmt Conflicts: Changelog Makefile cmdutils.c configure doc/APIchanges ffmpeg.c tests/lavf-regression.sh tests/ref/lavf/dv_fmt tests/ref/seek/lavf_dv Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add libavresampleJustin Ruggles2012-04-24
| | | | | | | | | | This is a new library for audio sample format, channel layout, and sample rate conversion.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: libxvid: remove disabled code qdm2: make a table static const qdm2: simplify bitstream reader setup for some subpacket types qdm2: use get_bits_left() build: Consistently handle conditional compilation for all optimization OBJS. avpacket, bfi, bgmc, rawenc: K&R prettyprinting cosmetics msrle: convert MS RLE decoding function to bytestream2. x86inc improvements for 64-bit Conflicts: common.mak libavcodec/avpacket.c libavcodec/bfi.c libavcodec/msrledec.c libavcodec/qdm2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Consistently handle conditional compilation for all optimization OBJS.Diego Biurrun2012-04-12
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: build: ppc: drop stray leftover backslash build: Only clean the architecture subdirectory we build for. build: drop some unnecessary dependencies from the H.264 parser build: prettyprinting cosmetics libavutil: Remove pointless rational test program. libavutil: Remove broken and pointless lzo test program. lavf doxy: expand AVStream.codec doxy. lavf doxy: improve AVStream.time_base doxy. lavf doxy: add some basic documentation about reading from the demuxer. lavf doxy: document passing options to demuxers. lavf doxy: clarify that an AVPacket contains encoded data. mpegtsenc: allow user triggered PES packet flushing APIchanges: mark the place where 0.7 was cut. APIchanges: mark the place where 0.8 was cut. APIchanges: fill in missing dates and hashes. smacker: convert palette and header reading to bytestream2. alac: convert extradata reading to bytestream2. Conflicts: doc/APIchanges libavcodec/smacker.c libavcodec/x86/Makefile libavfilter/Makefile libavutil/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Only clean the architecture subdirectory we build for.Diego Biurrun2012-03-26
| | | | | | | | | | This allows simplifying the Makefiles; it is no longer necessary to register arch subdirectory Makefiles, just putting them in place is enough.
| * build: prettyprinting cosmeticsDiego Biurrun2012-03-26
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (27 commits) avconv: free packet in write_frame() when discarding due to frame number limit FATE: use +/- flag option syntax for vp8 emu-edge tests lavf: make av_interleave_packet_per_dts() private. lavf: deprecate av_read_packet(). oggdec: output correct timestamps for Vorbis avconv: pass input stream timestamps to audio encoders lavc: shrink encoded audio packet size after encoding. xa: set correct bit rate xa: do not set bit_rate, block_align, or bits_per_coded_sample xa: fix end-of-file handling xa: fix timestamp calculation bink: fix typo in FFALIGN() argument bink: align plane width to 8 when calculating bundle sizes doc: pass -Idoc texi2html and texi2pod doc: texi2pod: add -I flag movenc: Add a min_frag_duration option rtsp: Set the default delay to 0.1 s for the RTSP/SDP/RTP demuxers libavformat: Set the default for the max_delay option to -1 Generate manpages for AV{Format,Codec}Context AVOptions. doc/avconv: remove entries for AVOptions. ... Conflicts: doc/Makefile doc/ffmpeg.texi doc/muxers.texi ffmpeg.c libavcodec/Makefile libavcodec/options.c libavcodec/vp8.c libavformat/options.c tests/fate/demux.mak tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Generate manpages for AV{Format,Codec}Context AVOptions.Anton Khirnov2012-03-20
| |
| * Remove libpostproc.Diego Biurrun2012-02-23
| | | | | | | | | | | | | | | | This library does not fit into Libav as a whole and its code is just a maintenance burden. Furthermore it is now available as an external project, which completely obviates any reason to keep it around. URL: http://git.videolan.org/?p=libpostproc.git
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: dsputil: remove debug message in dsputil_init(). movdec: Avoid av_malloc(0) in stss build: Drop YASM-OBJS-FFT from SUBDIR_VARS. build: Drop unused X86-OBJS variable. avconv: remove debugging cruft from do_video_out(). avconv: factorize setting stream_index for the output packet. frame{crc/md5}: set the stream timebase from codec timebase. apedec: remove unneeded #include of get_bits.h and associated macro apedec: av_fast_malloc() instead of av_realloc() apedec: fix handling of packet sizes that are not a multiple of 4 bytes Conflicts: libavcodec/apedec.c tests/ref/fate/4xm-1 tests/ref/fate/4xm-2 tests/ref/fate/aasc tests/ref/fate/armovie-escape124 tests/ref/fate/bethsoft-vid tests/ref/fate/cljr tests/ref/fate/creatureshock-avs tests/ref/fate/cscd tests/ref/fate/cvid-partial tests/ref/fate/deluxepaint-anm tests/ref/fate/dfa1 tests/ref/fate/dfa10 tests/ref/fate/dfa11 tests/ref/fate/dfa2 tests/ref/fate/dfa3 tests/ref/fate/dfa4 tests/ref/fate/dfa5 tests/ref/fate/dfa6 tests/ref/fate/dfa7 tests/ref/fate/dfa8 tests/ref/fate/dfa9 tests/ref/fate/film-cvid-pcm-stereo-8bit tests/ref/fate/flic-af11-palette-change tests/ref/fate/flic-magiccarpet tests/ref/fate/fraps-v2 tests/ref/fate/fraps-v3 tests/ref/fate/h264-lossless tests/ref/fate/interplay-mve-16bit tests/ref/fate/interplay-mve-8bit tests/ref/fate/mimic tests/ref/fate/motionpixels tests/ref/fate/mpeg2-field-enc tests/ref/fate/msvideo1-16bit tests/ref/fate/mtv tests/ref/fate/nuv tests/ref/fate/pictor tests/ref/fate/prores-alpha tests/ref/fate/ptx tests/ref/fate/qtrle-16bit tests/ref/fate/qtrle-1bit tests/ref/fate/quickdraw tests/ref/fate/rpza tests/ref/fate/sierra-vmd tests/ref/fate/targa-conformance-CCM8 tests/ref/fate/targa-conformance-UCM8 tests/ref/fate/tiertex-seq tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 tests/ref/fate/tscc-15bit tests/ref/fate/tscc-32bit tests/ref/fate/v210 tests/ref/fate/vc1-ism tests/ref/fate/vc1_sa00040 tests/ref/fate/vc1_sa00050 tests/ref/fate/vc1_sa10091 tests/ref/fate/vc1_sa20021 tests/ref/fate/vmnc-16bit tests/ref/fate/vmnc-32bit tests/ref/fate/vp5 tests/ref/fate/vp8-sign-bias tests/ref/fate/vqa-cc tests/ref/fate/wmv8-drm tests/ref/fate/yop tests/ref/fate/zmbv-8bit Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Drop YASM-OBJS-FFT from SUBDIR_VARS.Diego Biurrun2012-02-03
| | | | | | | | | | FFT code only appears in libavcodec, so there is no need to reset the variable when the build templates are instantiated for other libraries.
| * build: Drop unused X86-OBJS variable.Diego Biurrun2012-02-03
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (22 commits) wma: Clip WMA1 and WMA2 frame length to 11 bits. movenc: Don't require frame_size to be set for modes other than mov doc: Update APIchanges with info on muxer flushing movenc: Reindent a block tools: Remove some unnecessary #undefs. rv20: prevent calling ff_h263_decode_mba() with unset height/width tools: K&R reformatting cosmetics Ignore generated aviocat and ismindex tools. build: Automatically include architecture-specific library Makefile snippets. indeo5: prevent null pointer dereference on broken files pktdumper: Use usleep instead of sleep cosmetics: Remove some unnecessary block braces. Drop unnecessary prefix from *sink* variable and struct names. Add a tool for creating smooth streaming manifests movdec: Calculate an average bit rate for fragmented streams, too movenc: Write the sample rate instead of time scale in the stsd atom movenc: Add a separate ismv/isma (smooth streaming) muxer movenc: Allow the caller to decide on fragmentation libavformat: Add a flag for muxers that support write_packet(NULL) for flushing movenc: Add support for writing fragmented mov files ... Conflicts: Changelog cmdutils.c cmdutils.h doc/APIchanges ffmpeg.c ffplay.c libavfilter/Makefile libavformat/Makefile libavformat/avformat.h libavformat/movenc.c libavformat/movenc.h libavformat/version.h tools/graph2dot.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Automatically include architecture-specific library Makefile snippets.Diego Biurrun2012-01-25
| |
| * Remove ffmpeg.Anton Khirnov2012-01-23
| |
* | Remove avconvMichael Niedermayer2012-01-25
| | | | | | | | | | | | All features have been merged into ffmpeg. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Makefile: fix path to ffprobe.xsdMichael Niedermayer2011-12-27
| | | | | | | | | | Idea-by: beastd Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffprobe: add XML writerStefano Sabatini2011-12-27
| |
* | build: Try to find fate_config.sh.template in source pathAlexander Strasser2011-12-24
| | | | | | | | | | | | | | | | The FATE documentation depends on the mentioned file. But that did break out of tree builds because the file was not found. Signed-off-by: Alexander Strasser <eclipse7@gmx.net> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (23 commits) applehttp: Properly clean up if unable to probe a segment applehttp: Avoid reading uninitialized memory fate: Replace misleading "aac" in the name of an ADTS test with "adts". fate: Drop pointless "-an" from pictor test command. fate: split off image codec FATE tests into their own file fate: split off WMA codec FATE tests into their own file fate: split off lossless video and audio FATE tests into their own files fate: split off qtrle codec FATE tests into their own file fate: split off Ut Video codec FATE tests into their own file fate: split off screen codec FATE tests into their own file fate: split off Real Inc. codec FATE tests into their own file fate: split off AC-3 codec FATE tests into their own file mpegvideo: remove abort() in ff_find_unused_picture() rv40: NEON optimised loop filter strength selection rv40: rearrange loop filter functions configure: cosmetics: sort some lists where appropriate swscale_mmx: drop no longer required parameters from VSCALEX macros swscale: Mark yuv2planeX_8_mmx as MMX2; it contains MMX2 instructions. build: conditionally compile x86 H.264 chroma optimizations v410 encoder and decoder ... Conflicts: Changelog configure doc/developer.texi doc/general.texi libavcodec/arm/asm.S libavcodec/avcodec.h libavcodec/v410dec.c libavcodec/v410enc.c libavcodec/version.h libavcodec/x86/Makefile libavcodec/x86/dsputil_mmx.c libswscale/x86/swscale_mmx.c tests/Makefile tests/fate2.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: rename subdir.mak ---> library.makDiego Biurrun2011-12-13
| |
* | 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>
* | build: Disable avconv more completely while leaving the user the option to ↵Michael Niedermayer2011-12-13
| | | | | | | | | | | | enable it Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Makefile: disable compiling avconv by default.Michael Niedermayer2011-12-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add coverage support.Reimar Döffinger2011-12-05
| | | | | | | | | | | | | | | | Adds --enable-coverage to configure and a "coverage-html" make target. The dependency stuff in the Makefile is a bit questionable, but the best I could think of so far. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: presets: rename presets directory lavc: make avcodec_get_context_defaults3 "officially" public lavf: replace av_new_stream->avformat_new_stream part II. lavf,lavd: replace av_new_stream->avformat_new_stream part I. lavf: add avformat_new_stream as a replacement for av_new_stream. Use correct scaling table for bwd-pred MVs in second B-field Ut Video decoder Makefile: change presets extension to .avpreset lavfi: add rgbtestsrc source, ported from MPlayer libmpcodecs lavfi: add testsrc source AVOptions: add documentation. presets: update libx264 ffpresets Conflicts: Changelog doc/APIchanges doc/ffmpeg.texi ffpresets/libx264-ipod320.ffpreset ffpresets/libx264-ipod640.ffpreset ffserver.c libavcodec/avcodec.h libavcodec/options.c libavcodec/version.h libavdevice/libdc1394.c libavfilter/avfilter.h libavfilter/vsrc_testsrc.c libavformat/flvdec.c libavformat/riff.c libavformat/version.h libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * presets: rename presets directoryJanne Grunau2011-10-19
| |
| * Makefile: change presets extension to .avpresetAnton Khirnov2011-10-19
| | | | | | | | Fixes make install.
* | Add libswresample.Michael Niedermayer2011-09-19
| | | | | | | | | | | | | | | | | | Similar to libswscale this does resampling and format convertion, just for audio instead of video. changing sampling rate, sample formats, channel layouts and sample packing all in one with a very simple public interface. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'hexene/scratchpad'Michael Niedermayer2011-09-14
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * hexene/scratchpad: Move & Rename buildscript, remove tabs Fix regular build Support (H/W accelerated) H.264 decoding on Android via Stagefright Add build-script for Android C++ Support ;) Conflicts: Changelog Makefile configure libavcodec/Makefile libavcodec/allcodecs.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | C++ Support ;)Mohamed Naufal2011-08-31
| |/
| * Fix NASM include directiveDave Yeo2011-08-15
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | build: fix install rule with --progs-suffix.Clément Bœsch2011-09-11
| |
* | Makefile: remove unused PROGS_G.Clément Bœsch2011-09-01
| |
* | build: introduce --progs-suffix option.Clément Bœsch2011-09-01
| |
* | Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'Michael Niedermayer2011-08-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b2c087871dafc7d030b2d48457ddff597dfd4925': Move x86util.asm from libavcodec/ to libavutil/. Move x86inc.asm to libavutil/. APIchanges: note error_recognition in lavf lavf: add support for error_recognition, use it in avidec, and bump minor API version avconv: change semantics of -map avconv: get rid of new* options. cmdutils: allow precisely specifying a stream for AVOptions. configure: add missing CFLAGS to fix building on the HURD libx264: Include hint for possible values for configuring libx264 cmdutils: allow ':'-separated modifiers in option names. avconv: make -map_metadata work consistently with the other options avconv: remove deprecated options. avconv: make -map_chapters accept only the input file index. Make a copy of ffmpeg under a new name -- avconv. ffmpeg: add a warning stating that the program is deprecated. Add weighted motion compensation for RV40 B-frames RV3/4: calculate B-frame motion weights once per frame Move RV3/4-specific DSP functions into their own context mjpeg: propagate decode errors from ff_mjpeg_decode_sos and ff_mjpeg_decode_dqt h264: notice memory allocation failure Conflicts: .gitignore Makefile cmdutils.c configure doc/ffplay.texi doc/ffprobe.texi doc/ffserver.texi libavcodec/libx264.c libavformat/avformat.h libavformat/avidec.c libavformat/version.h tests/lavf-regression.sh tests/lavfi-regression.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Make a copy of ffmpeg under a new name -- avconv.Anton Khirnov2011-08-12
| | | | | | | | | | | | | | It will be further developed with a few incompatible changes. ffmpeg.c will stay as is for some time, so any scripts using it won't be broken.
| * Rename ffserver to avserver.Anton Khirnov2011-08-09
| |
| * Rename ffprobe to avprobe.Anton Khirnov2011-08-09
| |
| * Rename ffplay to avplay.Anton Khirnov2011-08-09
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rv30: return AVERROR(EINVAL) instead of EINVAL build: add -L flags before existing LDFLAGS simple_idct: whitespace cosmetics simple_idct: make repeated code a macro dsputil: remove huge #if 0 block simple_idct: change 10-bit add/put stride from pixels to bytes dsputil: allow 9/10-bit functions for non-h264 codecs dnxhd: rename some data tables dnxhdenc: remove inline from function only called through pointer dnxhdenc: whitespace cosmetics swscale: mark YUV422P10(LE,BE) as supported for output configure: add -xc99 to LDFLAGS for Sun CC Remove unused and non-compiling vestigial g729 decoder Remove unused code under G729_BITEXACT #ifdef. mpegvideo: fix invalid picture unreferencing. dsputil: Remove extra blank line at end. dsputil: Replace a LONG_MAX check with HAVE_FAST_64BIT. simple_idct: add 10-bit version Conflicts: Makefile libavcodec/g729data.h libavcodec/g729dec.c libavcodec/rv30.c tests/ref/lavfi/pixdesc tests/ref/lavfi/pixfmts_copy tests/ref/lavfi/pixfmts_null tests/ref/lavfi/pixfmts_scale tests/ref/lavfi/pixfmts_vflip Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: add -L flags before existing LDFLAGSMans Rullgard2011-07-21
| | | | | | | | | | | | | | | | This ensures the linker picks the just built libraries even if LDFLAGS for some reason contains -L flags pointing at other directories containing libav libraries. Signed-off-by: Mans Rullgard <mans@mansr.com>