summaryrefslogtreecommitdiff
path: root/libavcodec/Makefile
Commit message (Collapse)AuthorAge
* Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d'Michael Niedermayer2013-05-24
|\ | | | | | | | | | | | | | | | | | | | | | | * commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d': w32pthreads: move from lavc to compat/ Conflicts: libavcodec/Makefile libavcodec/pthread.c libavcodec/vp8.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * w32pthreads: move from lavc to compat/Anton Khirnov2013-05-24
| | | | | | | | It will be used in other places than lavc.
| * Escape 130 (RPL) decoderEli Friedman2013-05-18
| | | | | | | | | | | | | | | | Some fixes provided by Paul B Mahol <onemda@gmail.com> and Michael Niedermayer <michaelni@gmx.at> and me. Signed-off-by: Diego Biurrun <diego@biurrun.de> Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
* | s302m encoderDarryl Wallace2013-05-23
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Support playing SMV files.Ash Hughes2013-05-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1232a1647ab27e024a3baf4d01d40c8d08d6ced9'Michael Niedermayer2013-05-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1232a1647ab27e024a3baf4d01d40c8d08d6ced9': Apple Intermediate Codec decoder movenc: Don't add base_data_offset in tfhd for PIFF files Conflicts: Changelog libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/codec_desc.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Apple Intermediate Codec decoderKostya Shishkov2013-05-17
| |
* | ADPCM IMA Radical decoderJames Almer2013-05-10
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | ADPCM DTK decoderJames Almer2013-05-10
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | Add wmv2 dependency to vc1 compilation.Carl Eugen Hoyos2013-05-02
| | | | | | | | Fixes compilation with --disable-everything --enable-decoder=vc1.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-04-22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avcodec: Bump minor for JPEG 2000 decoder JPEG 2000 decoder for DCinema The mqc code is merged, the rest is added independent of the existing jpeg2000 decoder and encoder. Conflicts: Changelog doc/general.texi libavcodec/Makefile libavcodec/allcodecs.c libavcodec/mqc.c libavcodec/mqc.h libavcodec/mqcdec.c libavcodec/version.h tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * JPEG 2000 decoder for DCinemaNicolas Bertrand2013-04-22
| | | | | | | | | | | | | | | | Based on the 2007 GSoC project from Kamil Nowosad <k.nowosad@students.mimuw.edu.pl> Updated to current programming standards, style and many more small fixes by Diego Biurrun <diego@biurrun.de>. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * hpeldsp: Add half-pel functions (currently copies of dsputil)Ronald S. Bultje2013-04-19
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | avcodec: rename jpeg2000 decoder to j2kMichael Niedermayer2013-04-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | subtitles: introduce ASS codec id and use it.Clément Bœsch2013-04-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, we have a AV_CODEC_ID_SSA, which matches the way the ASS/SSA markup is muxed in a standalone .ass/.ssa file. This means the AVPacket data starts with a "Dialogue:" string, followed by a timing information (start and end of the event as string) and a trailing CRLF after each line. One packet can contain several lines. We'll refer to this layout as "SSA" or "SSA lines". In matroska, this markup is not stored as such: it has no "Dialogue:" prefix, it contains a ReadOrder field, the timing information is not in the payload, and it doesn't contain the trailing CRLF. See [1] for more info. We'll refer to this layout as "ASS". Since we have only one common codec for both formats, the matroska demuxer is constructing an AVPacket following the "SSA lines" format. This causes several problems, so it was decided to change this into clean ASS packets. Some insight about what is changed or unchanged in this commit: CODECS ------ - the decoding process still writes "SSA lines" markup inside the ass fields of the subtitles rectangles (sub->rects[n]->ass), which is still the current common way of representing decoded subtitles markup. It is meant to change later. - new ASS codec id: AV_CODEC_ID_ASS (which is different from the legacy AV_CODEC_ID_SSA) - lavc/assdec: the "ass" decoder is renamed into "ssa" (instead of "ass") for consistency with the codec id and allows to add a real ass decoder. This ass decoder receives clean ASS lines (so it starts with a ReadOrder, is followed by the Layer, etc). We make sure this is decoded properly in a new ass-line rectangle of the decoded subtitles (the ssa decoder OTOH is doing a simple straightforward copy). Using the packet timing instead of data string makes sure the ass-line now contains the appropriate timing. - lavc/assenc: just like the ass decoder, the "ssa" encoder is renamed into "ssa" (instead of "ass") for consistency with the codec id, and allows to add a real "ass" encoder. One important thing about this encoder is that it only supports one ass rectangle: we could have put several dialogue events in the AVPacket (separated by a \0 for instance) but this would have cause trouble for the muxer which needs not only the start time, but also the duration: typically, you have merged events with the same start time (stored in the AVPacket->pts) but a different duration. At the moment, only the matroska do the merge with the SSA-line codec. We will need to make sure all the decoders in the future can't add more than one rectangle (and only one Dialogue line in it obviously). FORMATS ------- - lavf/assenc: the .ass/.ssa muxer can take both SSA and ASS packets. In the case of ASS packets as input, it adds the timing based on the AVPacket pts and duration, and mux it with "Dialogue:", trailing CRLF, etc. - lavf/assdec: unchanged; it currently still only outputs SSA-lines packets. - lavf/mkv: the demuxer can now output ASS packets without the need of any "SSA-lines" reconstruction hack. It will become the default at next libavformat bump, and the SSA support will be dropped from the demuxer. The muxer can take ASS packets since it's muxed normally, and still supports the old SSA packets. All the SSA support and hacks in Matroska code will be dropped at next lavf bump. [1]: http://www.matroska.org/technical/specs/subtitles/ssa.html
* | avcodec: rename prores encodersMichael Niedermayer2013-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the first names of authors sounds somewhat unprofessional and might be considered offensive which is not intended. The new names use the initials of the authors due to simplicity and the possibility to apply it consistently without the need to find political correct names for each future case where alternative codecs might exist. Also its shorter ... If someone has a better idea, like maybe 2 random letters and people prefer it then iam happy to switch to that ... Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libshine fixed point MP3 encoding supportPaul B Mahol2013-04-11
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit '8a776ad90e00ab2b98e8683ac6182d641a383c3a'Michael Niedermayer2013-04-11
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '8a776ad90e00ab2b98e8683ac6182d641a383c3a': h261: Move shared data tables from a header to a proper C file Conflicts: libavcodec/Makefile libavcodec/h261data.c libavcodec/h261dec.c libavcodec/h261enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h261: Move shared data tables from a header to a proper C fileDiego Biurrun2013-04-10
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-04-11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: dsputil: Make dsputil selectable Conflicts: configure libavcodec/Makefile libavcodec/x86/Makefile libavcodec/x86/constants.c libavcodec/x86/dsputil_mmx.c libavcodec/x86/dsputil_mmx.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Make dsputil selectableRonald S. Bultje2013-04-10
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'b4d24b471bc52f1f78a43ee330199e70483e51c3'Michael Niedermayer2013-03-28
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b4d24b471bc52f1f78a43ee330199e70483e51c3': build: Remove configure-generated .config file on distclean msmpeg4: Split decoding related functions to a separate file Conflicts: Makefile libavcodec/Makefile libavcodec/msmpeg4.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * msmpeg4: Split decoding related functions to a separate fileMartin Storsjö2013-03-27
| | | | | | | | | | | | | | | | This fixes standalone compilation of the msmpeg4v2, msmpeg4v3 and wmv2 encoders, that previously failed to link due to the decoder codepaths requiring error_resilience. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '1b6d66745ac1768adb387c2227cdcf4452271149'Michael Niedermayer2013-03-28
|\| | | | | | | | | | | | | | | | | | | | | * commit '1b6d66745ac1768adb387c2227cdcf4452271149': Split MPEG-1/2 decoder code off from MPEG-1/2 common code Conflicts: libavcodec/Makefile libavcodec/mpeg12.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Split MPEG-1/2 decoder code off from MPEG-1/2 common codeDiego Biurrun2013-03-27
| |
* | Merge commit '1db6a080bddd14fed6b29140ecd2e21e42b1c022'Michael Niedermayer2013-03-28
|\| | | | | | | | | | | | | | | | | | | | | * commit '1db6a080bddd14fed6b29140ecd2e21e42b1c022': dca: Move ff_dca_convert_bitstream() to the DCA common code vdpau: wrap codec specific functions in appropiate #ifs Conflicts: libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dca: Move ff_dca_convert_bitstream() to the DCA common codeDiego Biurrun2013-03-27
| | | | | | | | This makes the DCA parser and decoder independent.
* | vp8: WebP decoding supportMichael Niedermayer2013-03-22
| | | | | | | | | | | | | | VP8L, padding and bounds checks by Pascal Massimino Reviewed-by: Pascal Massimino <pascal.massimino@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix Makefile dependency for the dvd_nav parser.Carl Eugen Hoyos2013-03-19
| | | | | | | | Fixes compilation for --disable-everything --enable-parser=dvd_nav
* | mpeg: Add passing DVD navigation packets (startcode 0x1bf) to caller to ↵Richard2013-03-17
| | | | | | | | | | | | | | | | | | allow better playback handling of DVDs. The two types of packets (PCI and DSI) are passed untouched but combined by the new codec ID AV_CODEC_ID_DVD_NAV. The first 980 bytes in the packet contain the PCI data. The next 1018 are the DSI data. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc: make compilation of frame_thread_encoder.o optional.Ronald S. Bultje2013-03-14
| | | | | | | | | | | | | | | | Only compile if CONFIG_ENCODERS is enabled, i.e. if at least one encoder is to be compiled. This prevents it from being includes in a decoder-only build. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Revert "Merge commit '0517c9e098092709397cc522c59fa63c83cc81be'" bring the ↵Michael Niedermayer2013-03-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | old audio resampling API back This reverts commit d3edc65dd1e5b5d4246fcb8bcd216eb558bab7d4, reversing changes made to 150de78d7c9cee65b4095832b25ae353e0d7c7af. Conflicts: libavcodec/version.h It seems there are several applications still using it Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | hpeldsp: add half-pel functions (currently copies of dsputil).Ronald S. Bultje2013-03-13
| |
* | Merge commit '0517c9e098092709397cc522c59fa63c83cc81be'Michael Niedermayer2013-03-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0517c9e098092709397cc522c59fa63c83cc81be': lavc: remove disabled FF_API_AVCODEC_RESAMPLE cruft Conflicts: libavcodec/Makefile libavcodec/avcodec.h libavcodec/resample.c libavcodec/resample2.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: remove disabled FF_API_AVCODEC_RESAMPLE cruftAnton Khirnov2013-03-11
| |
| * lavc: remove disabled FF_API_CODEC_ID cruftAnton Khirnov2013-03-09
| |
* | dsputil: make selectable.Ronald S. Bultje2013-03-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'dbd2a34ba5e5e46b6835e4425c360723c643b7a8'Michael Niedermayer2013-03-08
|\| | | | | | | | | | | | | | | | | | | * commit 'dbd2a34ba5e5e46b6835e4425c360723c643b7a8': build: cosmetics: Group hw accelerator Makefile entries together Conflicts: libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: cosmetics: Group hw accelerator Makefile entries togetherDiego Biurrun2013-03-07
| |
* | buildsys: only include log2_tab per library for shared buildsMichael Niedermayer2013-03-04
| | | | | | | | | | | | Fix linking failures with -all_load due to multiple log2_tabs Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
* | Merge commit 'aa11cb79318baa3415d553424ba378f6c62e1f9b'Michael Niedermayer2013-02-18
|\| | | | | | | | | | | | | | | | | | | | | * commit 'aa11cb79318baa3415d553424ba378f6c62e1f9b': build: make audio_frame_queue a stand-alone component Conflicts: configure libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: make audio_frame_queue a stand-alone componentLuca Barbato2013-02-17
| | | | | | | | | | Encoders requiring it have the dependency expressed in the configure.
* | Merge commit '870a0c669e536d56c6325d84f65e34c53792398e'Michael Niedermayer2013-02-18
|\| | | | | | | | | | | | | | | | | | | * commit '870a0c669e536d56c6325d84f65e34c53792398e': build: The libopencore-amrnb encoder depends on audio_frame_queue Conflicts: libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: The libopencore-amrnb encoder depends on audio_frame_queueDiego Biurrun2013-02-17
| | | | | | | | | | CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '79dad2a932534d1155079f937649e099f9e5cc27'Michael Niedermayer2013-02-07
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '79dad2a932534d1155079f937649e099f9e5cc27': dsputil: Separate h264chroma Conflicts: libavcodec/dsputil_template.c libavcodec/ppc/dsputil_ppc.c libavcodec/vc1dec.c libavcodec/vc1dsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Separate h264chromaDiego Biurrun2013-02-06
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-01-24
|\| | | | | | | | | | | | | | | | | | | | | * qatar/master: dsputil: Separate h264 qpel Conflicts: libavcodec/dsputil_template.c libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Separate h264 qpelMans Rullgard2013-01-24
| | | | | | | | | | | | | | | | | | | | The sh4 optimizations are removed, because the code is 100% identical to the C code, so it is unlikely to provide any real practical benefit. Signed-off-by: Diego Biurrun <diego@biurrun.de> Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'e6bc38fd49c94726b45d5d5cc2b756ad8ec49ee0'Michael Niedermayer2013-01-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e6bc38fd49c94726b45d5d5cc2b756ad8ec49ee0': wmv2: move IDCT to its own DSP context. Conflicts: libavcodec/dsputil.h tests/ref/seek/vsynth2-wmv2 tests/ref/vsynth/vsynth1-wmv2 tests/ref/vsynth/vsynth2-wmv2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wmv2: move IDCT to its own DSP context.Ronald S. Bultje2013-01-20
| | | | | | | | | | | | | | | | | | | | | | This allows us to remove FF_IDCT_WMV2, which serves no practical purpose other than to be able to select the WMV2 IDCT for MPEG (or vice versa) and get corrupt output. Fate tests for all wmv2-related tests change, because (for some obscure reason) they forced use of the MPEG IDCT. You would get the same changes previously by not using -idct simple in the fate test (or replacing it with -idct auto).
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-26 08:02:40 +0000