summaryrefslogtreecommitdiff
path: root/libavcodec/Makefile
Commit message (Collapse)AuthorAge
* Merge commit 'adf8227cf4e7b4fccb2ad88e1e09b6dc00dd00ed'Michael Niedermayer2014-08-05
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'adf8227cf4e7b4fccb2ad88e1e09b6dc00dd00ed': vc-1: Add platform-specific start code search routine to VC1DSPContext. Conflicts: configure libavcodec/arm/vc1dsp_init_arm.c libavcodec/vc1dsp.c libavcodec/vc1dsp.h See: 9d8ecdd8ca6d248e7439e8fdf255e39eda14e0f2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc-1: Add platform-specific start code search routine to VC1DSPContext.Ben Avison2014-08-04
| | | | | | | | | | | | | | Initialise VC1DSPContext for parser as well as for decoder. Note, the VC-1 code doesn't actually use the function pointer yet. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8'Michael Niedermayer2014-08-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8': h264: Move start code search functions into separate source files. Conflicts: libavcodec/arm/Makefile libavcodec/arm/h264dsp_init_arm.c libavcodec/h264_parser.c libavcodec/h264dsp.c libavcodec/startcode.c libavcodec/startcode.h See: 270cede3f3772117454a14b620803d731036942d Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: Move start code search functions into separate source files.Ben Avison2014-08-04
| | | | | | | | | | | | This permits re-use with parsers for codecs which use similar start codes. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'a786c8259dafeca9744252230b5d78f67810770c'Michael Niedermayer2014-08-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a786c8259dafeca9744252230b5d78f67810770c': idct: Split off Xvid IDCT Conflicts: libavcodec/Makefile libavcodec/mpeg4videodec.c libavcodec/x86/Makefile libavcodec/x86/idctdsp_init.c This split is somewhat restructured leaving the xvid IDCT available outside mpeg4 if manually selected. The code also could not be merged unchanged as it conflicted with a bugfix in FFmpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * idct: Split off Xvid IDCTDiego Biurrun2014-08-01
| | | | | | | | | | The Xvid IDCT is only required to decode some Xvid-encoded MPEG-4 files, so there is no point in having it as an unconditional part of idctdsp.
* | Fix standalone compilation of the WebVTT decoder.Carl Eugen Hoyos2014-08-01
| |
* | Fix standalone compilation of the webm_dash_manifest demuxer.Carl Eugen Hoyos2014-07-27
| |
* | Fix standalone compilation of the legacy mpegvideo decoder.Carl Eugen Hoyos2014-07-27
| |
* | avcodec: add avdctMichael Niedermayer2014-07-27
| | | | | | | | | | | | | | | | | | | | | | | | This provides a public sustainable API/ABI for DCT functions. Only externally used dct functions are included. The structure is extensible without ABI issues compared to the existing dct contexts. See Mailing list and IRC log of 2014-07-26/27 Reviewed-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | reintroduce avpriv_dsputil_init() to maintain ABI until next soname bumpMichael Niedermayer2014-07-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '2ce53880bfeb431decdd2fc82298c0aff823ab47'Michael Niedermayer2014-07-21
|\| | | | | | | | | | | | | | | | | | | * commit '2ce53880bfeb431decdd2fc82298c0aff823ab47': build: Conditionally compile all avcodec test programs Conflicts: libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Conditionally compile all avcodec test programsDiego Biurrun2014-07-21
| |
* | Merge commit '16b7328058fa600d5158c84d9cc621a134eb88bc'Michael Niedermayer2014-07-21
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '16b7328058fa600d5158c84d9cc621a134eb88bc': build: Conditionally build and run DCT test program Conflicts: libavcodec/Makefile libavcodec/dct-test.c tests/fate/libavcodec.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Conditionally build and run DCT test programDiego Biurrun2014-07-21
| |
* | Merge commit 'bd499d9af668aef979ec9f3f3215b8dd508c7ec1'Michael Niedermayer2014-07-21
|\| | | | | | | | | | | | | | | | | | | * commit 'bd499d9af668aef979ec9f3f3215b8dd508c7ec1': build: Conditionally build and test iirfilter Conflicts: libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Conditionally build and test iirfilterDiego Biurrun2014-07-21
| |
* | Merge commit 'b4edbe9a0eb48423fbf249b0ca7fb62838bdb7f5'Michael Niedermayer2014-07-18
|\| | | | | | | | | | | | | | | | | | | * commit 'b4edbe9a0eb48423fbf249b0ca7fb62838bdb7f5': libgsm: Split decoder and encoder Conflicts: libavcodec/libgsmenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libgsm: Split decoder and encoderNidhi Makhijani2014-07-18
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '2d60444331fca1910510038dd3817bea885c2367'Michael Niedermayer2014-07-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2d60444331fca1910510038dd3817bea885c2367': dsputil: Split motion estimation compare bits off into their own context Conflicts: configure libavcodec/Makefile libavcodec/arm/Makefile libavcodec/dvenc.c libavcodec/error_resilience.c libavcodec/h264.h libavcodec/h264_slice.c libavcodec/me_cmp.c libavcodec/me_cmp.h libavcodec/motion_est.c libavcodec/motion_est_template.c libavcodec/mpeg4videoenc.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/x86/Makefile libavcodec/x86/me_cmp_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Split motion estimation compare bits off into their own contextDiego Biurrun2014-07-17
| |
* | Merge commit 'f46bb608d9d76c543e4929dc8cffe36b84bd789e'Michael Niedermayer2014-07-10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f46bb608d9d76c543e4929dc8cffe36b84bd789e': dsputil: Split off pixel block routines into their own context Conflicts: configure libavcodec/dsputil.c libavcodec/mpegvideo_enc.c libavcodec/pixblockdsp_template.c libavcodec/x86/dsputilenc.asm libavcodec/x86/dsputilenc_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Split off pixel block routines into their own contextDiego Biurrun2014-07-09
| |
* | Merge commit 'd5cf5afabbf43f00283e70b12afbe1da030d85b6'Michael Niedermayer2014-07-09
|\| | | | | | | | | | | | | * commit 'd5cf5afabbf43f00283e70b12afbe1da030d85b6': adxdec: get rid of an avpriv function Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * adxdec: get rid of an avpriv functionAnton Khirnov2014-07-09
| | | | | | | | | | The only thing the demuxer needs is the sample rate to set the timebase, which can be simply read with AV_RB32.
* | Merge commit 'f6ee61fb05482c617f5deee29a190d8ff483b3d1'Michael Niedermayer2014-07-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f6ee61fb05482c617f5deee29a190d8ff483b3d1': lavc: export DV profile API used by muxer/demuxer as public Conflicts: configure doc/APIchanges libavcodec/Makefile libavcodec/dv_profile.c libavcodec/dv_profile.h libavcodec/version.h libavformat/dvenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: export DV profile API used by muxer/demuxer as publicAnton Khirnov2014-07-09
| |
* | Fix wmv1 encoding if all other msmpeg4-related encoders were disabled.Carl Eugen Hoyos2014-07-09
| |
* | Merge commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3'Michael Niedermayer2014-07-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3': dsputil: Split off FDCT bits into their own context Conflicts: configure libavcodec/Makefile libavcodec/asvenc.c libavcodec/dnxhdenc.c libavcodec/dsputil.c libavcodec/mpegvideo.h libavcodec/mpegvideo_enc.c libavcodec/x86/Makefile libavcodec/x86/dsputilenc_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Split off FDCT bits into their own contextDiego Biurrun2014-07-07
| |
* | Merge commit '246f869590b8c7313d26e1c2ef56db01f6fd2503'Michael Niedermayer2014-07-07
|\| | | | | | | | | | | | | | | | | | | * commit '246f869590b8c7313d26e1c2ef56db01f6fd2503': vmd: Split audio and video decoder Conflicts: libavcodec/vmdvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vmd: Split audio and video decoderNidhi Makhijani2014-07-07
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '8d686ca59db14900ad5c12b547fb8a7afc8b0b94'Michael Niedermayer2014-07-07
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '8d686ca59db14900ad5c12b547fb8a7afc8b0b94': dsputil: Split off *_8x8basis to a separate context Conflicts: libavcodec/dsputil.c libavcodec/mpegvideo_enc.c libavcodec/x86/dsputilenc_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Split off *_8x8basis to a separate contextDiego Biurrun2014-07-06
| |
* | Merge commit 'd6902070c52151ec1e8154ce9b22283a1d0bc192'Michael Niedermayer2014-07-07
|\| | | | | | | | | | | | | | | | | | | | | * commit 'd6902070c52151ec1e8154ce9b22283a1d0bc192': dsicin: Split audio and video decoder Conflicts: libavcodec/Makefile libavcodec/dsicinvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsicin: Split audio and video decoderNidhi Makhijani2014-07-06
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '2fc85fe96e7e0e5fc433b98eacebf4d3511d2d58'Michael Niedermayer2014-07-06
|\| | | | | | | | | | | | | | | | | | | * commit '2fc85fe96e7e0e5fc433b98eacebf4d3511d2d58': bmv: Split audio and video decoder Conflicts: libavcodec/bmvvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * bmv: Split audio and video decoderNidhi Makhijani2014-07-06
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'b0633f83f277c05bf1f617a99c7aedd2db8306e3'Michael Niedermayer2014-07-06
|\| | | | | | | | | | | | | | | | | | | * commit 'b0633f83f277c05bf1f617a99c7aedd2db8306e3': paf: split audio and video decoder Conflicts: libavcodec/pafvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * paf: split audio and video decoderNidhi Makhijani2014-07-06
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '373a6dda5422186bc057297342a9e559a564595e'Michael Niedermayer2014-07-06
|\| | | | | | | | | | | | | | | | | | | | | * commit '373a6dda5422186bc057297342a9e559a564595e': cljr: split decoder and encoder Conflicts: libavcodec/Makefile libavcodec/cljrdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cljr: split decoder and encoderNidhi Makhijani2014-07-06
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | avcodec/Makefile: add libutvideo.h to SKIPHEADERSMichael Niedermayer2014-07-06
| | | | | | | | | | | | | | libutvideo.h is not a C header and thus fails building as a C file Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix standalone compilation of the amv encoder.Carl Eugen Hoyos2014-07-05
| |
* | Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'Michael Niedermayer2014-07-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e3fcb14347466095839c2a3c47ebecff02da891e': dsputil: Split off IDCT bits into their own context Conflicts: configure libavcodec/aic.c libavcodec/arm/Makefile libavcodec/arm/dsputil_init_arm.c libavcodec/arm/dsputil_init_armv6.c libavcodec/asvdec.c libavcodec/dnxhdenc.c libavcodec/dsputil.c libavcodec/dvdec.c libavcodec/dxva2_mpeg2.c libavcodec/intrax8.c libavcodec/mdec.c libavcodec/mjpegdec.c libavcodec/mjpegenc_common.h libavcodec/mpegvideo.c libavcodec/ppc/dsputil_altivec.h libavcodec/ppc/dsputil_ppc.c libavcodec/ppc/idctdsp.c libavcodec/x86/Makefile libavcodec/x86/dsputil_init.c libavcodec/x86/dsputil_mmx.c libavcodec/x86/dsputil_x86.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Split off IDCT bits into their own contextDiego Biurrun2014-06-30
| |
* | Merge commit 'adcb8392c9b185fd8a91a95fa256d15ab1432a30'Michael Niedermayer2014-07-01
|\| | | | | | | | | | | | | | | | | | | | | * commit 'adcb8392c9b185fd8a91a95fa256d15ab1432a30': mjpeg: Split off bits shared by MJPEG and LJPEG encoders Conflicts: libavcodec/mjpegenc.c libavcodec/mjpegenc.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mjpeg: Split off bits shared by MJPEG and LJPEG encodersDiego Biurrun2014-06-30
| | | | | | | | This obviates a dependency of the LJPEG encoder on mpegvideo.
* | Merge commit 'fab9df63a3156ffe1f9490aafaea41e03ef60ddf'Michael Niedermayer2014-06-23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fab9df63a3156ffe1f9490aafaea41e03ef60ddf': dsputil: Split off global motion compensation bits into a separate context Conflicts: libavcodec/dsputil.c libavcodec/dsputil.h libavcodec/ppc/dsputil_altivec.h libavcodec/x86/dsputil_init.c libavcodec/x86/dsputil_mmx.c libavcodec/x86/dsputil_x86.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Split off global motion compensation bits into a separate contextDiego Biurrun2014-06-23
| |