summaryrefslogtreecommitdiff
path: root/libavcodec/version.h
Commit message (Collapse)AuthorAge
* Merge commit '759001c534287a96dc96d1e274665feb7059145d'Michael Niedermayer2013-03-12
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '759001c534287a96dc96d1e274665feb7059145d': lavc decoders: work with refcounted frames. Anton Khirnov (1): lavc decoders: work with refcounted frames. Clément Bœsch (47): lavc/ansi: reset file lavc/ansi: re-do refcounted frame changes from Anton fraps: reset file lavc/fraps: switch to refcounted frames gifdec: reset file lavc/gifdec: switch to refcounted frames dsicinav: resolve conflicts smc: resolve conflicts zmbv: resolve conflicts rpza: resolve conflicts vble: resolve conflicts xxan: resolve conflicts targa: resolve conflicts vmnc: resolve conflicts utvideodec: resolve conflicts tscc: resolve conflicts ulti: resolve conflicts ffv1dec: resolve conflicts dnxhddec: resolve conflicts v210dec: resolve conflicts vp3: resolve conflicts vcr1: resolve conflicts v210x: resolve conflicts wavpack: resolve conflicts pngdec: fix compilation roqvideodec: resolve conflicts pictordec: resolve conflicts mdec: resolve conflicts tiertexseqv: resolve conflicts smacker: resolve conflicts vb: resolve conflicts vqavideo: resolve conflicts xl: resolve conflicts tmv: resolve conflicts vmdav: resolve conflicts truemotion1: resolve conflicts truemotion2: resolve conflicts lcldec: fix compilation libcelt_dec: fix compilation qdrw: fix compilation r210dec: fix compilation rl2: fix compilation wnv1: fix compilation yop: fix compilation tiff: resolve conflicts interplayvideo: fix compilation qpeg: resolve conflicts (FIXME/TESTME). Hendrik Leppkes (33): 012v: convert to refcounted frames 8bps: fix compilation 8svx: resolve conflicts 4xm: resolve conflicts aasc: resolve conflicts bfi: fix compilation aura: fix compilation alsdec: resolve conflicts avrndec: convert to refcounted frames avuidec: convert to refcounted frames bintext: convert to refcounted frames cavsdec: resolve conflicts brender_pix: convert to refcounted frames cinepak: resolve conflicts cinepak: avoid using AVFrame struct directly in private context cljr: fix compilation cpia: convert to refcounted frames cscd: resolve conflicts iff: resolve conflicts and do proper conversion to refcounted frames 4xm: fix reference frame handling cyuv: fix compilation dxa: fix compilation eacmv: fix compilation eamad: fix compilation eatgv: fix compilation escape124: remove unused variable. escape130: convert to refcounted frames evrcdec: convert to refcounted frames exr: convert to refcounted frames mvcdec: convert to refcounted frames paf: properly free the frame data on decode close sgirle: convert to refcounted frames lavfi/moviesrc: use refcounted frames Michael Niedermayer (56): Merge commit '759001c534287a96dc96d1e274665feb7059145d' resolve conflicts in headers motion_est: resolve conflict mpeg4videodec: fix conflicts dpcm conflict fix dpx: fix conflicts indeo3: resolve confilcts kmvc: resolve conflicts kmvc: resolve conflicts h264: resolve conflicts utils: resolve conflicts rawdec: resolve conflcits mpegvideo: resolve conflicts svq1enc: resolve conflicts mpegvideo: dont clear data, fix assertion failure on fate vsynth1 with threads pthreads: resolve conflicts frame_thread_encoder: simple compilefix not yet tested snow: update to buffer refs crytsalhd: fix compile dirac: switch to new API sonic: update to new API svq1: resolve conflict, update to new API ffwavesynth: update to new buffer API g729: update to new API indeo5: fix compile j2kdec: update to new buffer API linopencore-amr: fix compile libvorbisdec: update to new API loco: fix compile paf: update to new API proresdec: update to new API vp56: update to new api / resolve conflicts xface: convert to refcounted frames xan: fix compile&fate v408: update to ref counted buffers v308: update to ref counted buffers yuv4dec: update to ref counted buffers y41p: update to ref counted frames xbm: update to refcounted frames targa_y216: update to refcounted buffers qpeg: fix fate/crash cdxl: fix fate tscc: fix reget buffer useage targa_y216dec: fix style msmpeg4: fix fate h264: ref_picture() copy fields that have been lost too update_frame_pool: use channel field h264: Put code that prevents deadlocks back mpegvideo: dont allow last == current wmalossless: fix buffer ref messup ff_alloc_picture: free tables in case of dimension mismatches h264: fix null pointer dereference and assertion failure frame_thread_encoder: update to bufrefs ec: fix used arrays snowdec: fix off by 1 error in dimensions check h264: disallow single unpaired fields as references of frames Paul B Mahol (2): lavc/vima: convert to refcounted frames sanm: convert to refcounted frames Conflicts: libavcodec/4xm.c libavcodec/8bps.c libavcodec/8svx.c libavcodec/aasc.c libavcodec/alsdec.c libavcodec/anm.c libavcodec/ansi.c libavcodec/avs.c libavcodec/bethsoftvideo.c libavcodec/bfi.c libavcodec/c93.c libavcodec/cavsdec.c libavcodec/cdgraphics.c libavcodec/cinepak.c libavcodec/cljr.c libavcodec/cscd.c libavcodec/dnxhddec.c libavcodec/dpcm.c libavcodec/dpx.c libavcodec/dsicinav.c libavcodec/dvdec.c libavcodec/dxa.c libavcodec/eacmv.c libavcodec/eamad.c libavcodec/eatgq.c libavcodec/eatgv.c libavcodec/eatqi.c libavcodec/error_resilience.c libavcodec/escape124.c libavcodec/ffv1.h libavcodec/ffv1dec.c libavcodec/flicvideo.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/g723_1.c libavcodec/gifdec.c libavcodec/h264.c libavcodec/h264.h libavcodec/h264_direct.c libavcodec/h264_loopfilter.c libavcodec/h264_refs.c libavcodec/huffyuvdec.c libavcodec/idcinvideo.c libavcodec/iff.c libavcodec/indeo2.c libavcodec/indeo3.c libavcodec/internal.h libavcodec/interplayvideo.c libavcodec/ivi_common.c libavcodec/jvdec.c libavcodec/kgv1dec.c libavcodec/kmvc.c libavcodec/lagarith.c libavcodec/libopenjpegdec.c libavcodec/mdec.c libavcodec/mimic.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mmvideo.c libavcodec/motion_est.c libavcodec/motionpixels.c libavcodec/mpc7.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo.h libavcodec/msrle.c libavcodec/msvideo1.c libavcodec/nuv.c libavcodec/options_table.h libavcodec/pcx.c libavcodec/pictordec.c libavcodec/pngdec.c libavcodec/pnmdec.c libavcodec/pthread.c libavcodec/qpeg.c libavcodec/qtrle.c libavcodec/r210dec.c libavcodec/rawdec.c libavcodec/roqvideodec.c libavcodec/rpza.c libavcodec/smacker.c libavcodec/smc.c libavcodec/svq1dec.c libavcodec/svq1enc.c libavcodec/targa.c libavcodec/tiertexseqv.c libavcodec/tiff.c libavcodec/tmv.c libavcodec/truemotion1.c libavcodec/truemotion2.c libavcodec/tscc.c libavcodec/ulti.c libavcodec/utils.c libavcodec/utvideodec.c libavcodec/v210dec.c libavcodec/v210x.c libavcodec/vb.c libavcodec/vble.c libavcodec/vcr1.c libavcodec/vmdav.c libavcodec/vmnc.c libavcodec/vp3.c libavcodec/vp56.c libavcodec/vp56.h libavcodec/vp6.c libavcodec/vqavideo.c libavcodec/wavpack.c libavcodec/xl.c libavcodec/xxan.c libavcodec/zmbv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc decoders: work with refcounted frames.Anton Khirnov2013-03-08
| |
* | Merge commit '1afddbe59e96af75f1c07605afc95615569f388f'Michael Niedermayer2013-03-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1afddbe59e96af75f1c07605afc95615569f388f': avpacket: use AVBuffer to allow refcounting the packets. Conflicts: libavcodec/avpacket.c libavcodec/utils.c libavdevice/v4l2.c libavformat/avidec.c libavformat/flacdec.c libavformat/id3v2.c libavformat/matroskaenc.c libavformat/mux.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avpacket: use AVBuffer to allow refcounting the packets.Anton Khirnov2013-03-08
| | | | | | | | | | | | This will allow us to avoid copying the packets in many cases. This breaks ABI.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-03-07
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavc: Deprecate the deinterlace functions in libavcodec h264: Integrate draw_horiz_band into ff_h264_draw_horiz_band Conflicts: configure ffmpeg_opt.c libavcodec/avcodec.h libavcodec/h264.c libavcodec/imgconvert.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: Deprecate the deinterlace functions in libavcodecRonald S. Bultje2013-03-07
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Deprecate deinterlaced in libavcodec.Ronald S. Bultje2013-03-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc: support subtitles character encoding conversion.Clément Bœsch2013-02-17
| |
* | lavc/tta: Add support for encrypted streamsJames Almer2013-02-12
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'ca1fe6c0e60808da45d4dfd8728f45e843b9f9b0'Michael Niedermayer2013-02-07
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'ca1fe6c0e60808da45d4dfd8728f45e843b9f9b0': h263: remove an unused parameter from ff_h263_decode_init_vlc flac: add channel layout masks for streams with 7 or 8 channels. flac: don't check the number of channels before setting the channel layout. Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flac: add channel layout masks for streams with 7 or 8 channels.Tim Walker2013-02-06
| | | | | | | | | | | | | | They were added to the latest FLAC specification: https://git.xiph.org/?p=flac-website.git;a=commit;h=65c199a2 Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | flac: add channel layout masks for streams with 7 or 8 channelsTim Walker2013-02-06
| | | | | | | | | | They were added to the latest FLAC specification: https://git.xiph.org/?p=flac-website.git;a=commit;h=65c199a2
* | Merge commit 'b85a5e87af4254b80913fe33591d96361f30832b'Michael Niedermayer2013-01-25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b85a5e87af4254b80913fe33591d96361f30832b': lavu: Add av_strnstr() h264: Allow discarding the cropping information from SPS Conflicts: Changelog doc/APIchanges libavcodec/avcodec.h libavcodec/version.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: Allow discarding the cropping information from SPSVittorio Giovara2013-01-25
| | | | | | | | | | | | Some 3D systems overload the meaning of the field for other purposes. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '93af2734ee609133eaeca28329d7f13241dd411f'Michael Niedermayer2013-01-21
|\| | | | | | | | | | | | | | | | | | | * commit '93af2734ee609133eaeca28329d7f13241dd411f': lavc: put FF_IDCT_{VP3,H264,CAVS,BINK,EA,WMV2} under FF_API_IDCT. Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: put FF_IDCT_{VP3,H264,CAVS,BINK,EA,WMV2} under FF_API_IDCT.Ronald S. Bultje2013-01-20
| | | | | | | | | | | | This allows us to get rid of them on the next major bump. All of the above are functionally irrelevant, and most of them are unused, except the vp3 one, which is used wrongly in the bfin arch optimizations.
* | EVRC decoderPaul B Mahol2013-01-21
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit '246da0b13551b1f80f067e4f258e5bd691f5ab33'Michael Niedermayer2013-01-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '246da0b13551b1f80f067e4f258e5bd691f5ab33': v4l2: avoid pointless indirection. vdpau: Add VC-1 decoding via hwaccel infrastructure vdpau: Add H.264 decoding via hwaccel infrastructure Conflicts: configure libavcodec/Makefile libavcodec/version.h libavdevice/v4l2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vdpau: Add VC-1 decoding via hwaccel infrastructureRémi Denis-Courmont2013-01-13
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * vdpau: Add H.264 decoding via hwaccel infrastructureRémi Denis-Courmont2013-01-13
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '200e8ac92007bc2fe30da05d3bd00ab620842a6b'Michael Niedermayer2013-01-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '200e8ac92007bc2fe30da05d3bd00ab620842a6b': vdpau: Add MPEG-4 decoding via hwaccel infrastructure vdpau: Add MPEG-1/2 decoding via hwaccel infrastructure Conflicts: configure libavcodec/Makefile libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vdpau: Add MPEG-4 decoding via hwaccel infrastructureRémi Denis-Courmont2013-01-13
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * vdpau: Add MPEG-1/2 decoding via hwaccel infrastructureRémi Denis-Courmont2013-01-13
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '44e065d56c87d6a9d0effccec5f31517f72924ec'Michael Niedermayer2013-01-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '44e065d56c87d6a9d0effccec5f31517f72924ec': vdpau: Add context and common helpers for hwaccel support Conflicts: Changelog doc/APIchanges libavcodec/vdpau.h libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vdpau: Add context and common helpers for hwaccel supportRémi Denis-Courmont2013-01-13
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * Drop Snow codecDiego Biurrun2013-01-06
| | | | | | | | Snow is a toy codec with no real-world use and horrible code.
* | 012v decoder.Carl Eugen Hoyos2013-01-06
| | | | | | | | | | The decoder also supports a12v, but removes the transparency layer since no samples with actual transparency are available for testing.
* | subviewer: sanitize packets.Clément Bœsch2013-01-03
| | | | | | | | | | | | | | | | The data does not contain timing or trailing line breaks anymore. In addition to being less idiotic, it is consistent with other codecs and thus allows more switches between formats and codecs. It also fixes the issue of the trailing line returns being simple \n instead of CRLF in the ASS rectangle dialogue (this is the reason of the FATE update).
* | microdvd: sanitize AVPackets.Clément Bœsch2012-12-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current MicroDVD AVPackets contain timing information and trailing line breaks. The data is now only composed of the markup data. Doing this consistently between text subtitles decoders allows to use different codec for various formats. For instance, MicroDVD markup is sometimes found in some VPlayer files. Also, generally speaking, the subtitles text decoders have no use of these timings (and they must not use them since it would break any user timing adjustment). Technically, this is a major ABI break. In practice, a mismatching lavf/lavc will now error out for MicroDVD decoding. Supporting both formats requires unnecessary complex and fragile code. FATE needs update because line breaks in the ASS file were "\n" (because that's what is used in the original file). ASS format expect "\r\n" line breaks; this commit fixes this issue. Also note that this "\r\n" trailing need to be moved at some point from the decoders to the ASS muxer.
* | Add SubViewer v1 subtitles demuxer and decoder.Clément Bœsch2012-12-31
| |
* | Add VPlayer subtitles demuxer and decoder.Clément Bœsch2012-12-30
| | | | | | | | | | | | | | Note that the linebreaks text codec option (but not the feature) has been removed; its main goal was to allow demuxers to configure the text decoder (and not meant to be used by users), but the AVOption are not a viable solution. This is solved differently in this commit.
* | Add MPL2 subtitles demuxer and decoder.Clément Bœsch2012-12-30
| |
* | Merge commit 'acb571c89a065d943163c11efb46de35774f1909'Michael Niedermayer2012-12-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'acb571c89a065d943163c11efb46de35774f1909': avcodec: bump minor for adaptive h264 frame-mt avconv: pass the actually selected decoder to filter_codec_opts(). Conflicts: Changelog ffmpeg_opt.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: bump minor for adaptive h264 frame-mtJanne Grunau2012-12-18
| | | | | | | | Also adds forgotten Changelog entry.
* | lavc: add pkt_size field to AVFrameStefano Sabatini2012-12-15
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-12-11
|\| | | | | | | | | | | | | | | | | | | | | * qatar/master: build: fix 'clean' target ZeroCodec: Flip output Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ZeroCodec: Flip outputCarl Eugen Hoyos2012-12-10
| | | | | | | | | | | | | | | | | | | | The initial testing of the VFW binary codec was flawed, likely due to an AviSynth bug. Re-testing using VirtualDub and various professional editing applications has revealed it should have been flipped. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * tak: demuxer, parser, and decoderPaul B Mahol2012-12-07
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
* | Flip zerocodec output.Carl Eugen Hoyos2012-12-09
| | | | | | | | Fixes ticket #1218
* | iff decoder: DEEP TVDC 32-bit decoderPeter Ross2012-12-04
| | | | | | | | Signed-off-by: Peter Ross <pross@xvid.org>
* | lavu/opt: allow to set sample and pixel format with av_opt_set_int()Stefano Sabatini2012-12-01
| | | | | | | | | | | | | | | | | | | | | | This change requires the user to specify min and max value, and makes possible to prevent the user to set AV_{SAMPLE,PIX}_FMT_NONE if forbidden. Add required ifdeffery in case of mixed libraries, when libavutil is updated but not the other libraries. This is a followup of 08d0969c1402ccec4dce44bd430128fb59d7b790.
* | Prepare gif decoder for use in conjunction with gif demuxer.Vitaliy E Sugrobov2012-11-30
| | | | | | | | | | | | | | | | | | | | | | Add capability of reading multiple frames instead of only first. Implement support for different gif frame 'disposal methods'. Add option that allows to change background color resulting from conversion of gif with transparency to any other format which not support it. Also bump lavc minor version. Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>
* | lavu/opt: change the way default pixel and sample format value is setStefano Sabatini2012-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the i64 field rather than the string value. Using a string to set a default sample/pixel format is weird, also the new interface is more consistent with the rest of the API. This is technically an API break, but hopefully there are no applications using this feature outside of FFmpeg. In order to save backward compatibility with mixed libraries in case libavutil is updated but not the other libraries, some ifdeffery hacks are added. Note that the version check is only performed when class->version != 0, since if it is not defined then we assume that no version was defined and the class is not affected by the change. We will luckily get rid of the hack at the next major bump.
* | ADPCM IMA Dialogic decoderPaul B Mahol2012-11-24
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | ADPCM AFC decoderPaul B Mahol2012-11-22
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | brender_pix: a new image decoderAleksi Nurmi2012-11-22
| | | | | | | | | | | | | | PIX is an image file format that was used by the BRender 3d engine. Signed-off-by: Aleksi Nurmi <aleksi.nurmi@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | add some planar PCM encodersPaul B Mahol2012-11-20
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | PCM signed 16-bit big-endian planar decoderPaul B Mahol2012-11-17
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | PCM signed 24-bit/32-bit little-endian planar decoderPaul B Mahol2012-11-17
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit '9a07c1332cfe092b57b5758f22b686ca58806c60'Michael Niedermayer2012-11-03
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9a07c1332cfe092b57b5758f22b686ca58806c60': parser: Move Doxygen documentation to the header files PGS subtitles: Expose forced flag x86: PMINUB: port to cpuflags Conflicts: libavcodec/avcodec.h libavcodec/pgssubdec.c libavcodec/version.h libavcodec/x86/ac3dsp.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-24 20:47:24 +0000