summaryrefslogtreecommitdiff
path: root/libavcodec/libxvid.c
Commit message (Collapse)AuthorAge
...
| * Deprecate avctx.coded_frameVittorio Giovara2015-07-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rationale is that coded_frame was only used to communicate key_frame, pict_type and quality to the caller, as well as a few other random fields, in a non predictable, let alone consistent way. There was agreement that there was no use case for coded_frame, as it is a full-sized AVFrame container used for just 2-3 int-sized properties, which shouldn't even belong into the AVCodecContext in the first place. The appropriate AVPacket flag can be used instead of key_frame, while quality is exported with the new AVPacketSideData quality factor. There is no replacement for the other fields as they were unreliable, mishandled or just not used at all. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '5d3addb937946eca5391e40b5e6308e74ac6f77b'Michael Niedermayer2015-07-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5d3addb937946eca5391e40b5e6308e74ac6f77b': Add a quality factor packet side data Conflicts: doc/APIchanges ffmpeg.c libavcodec/avcodec.h libavcodec/mpegvideo_enc.c libavcodec/version.h Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * Add a quality factor packet side dataVittorio Giovara2015-07-20
| | | | | | | | | | | | | | | | This is necessary to preserve the quality information currently exported with coded_frame. Add the new side data to every encoder that needs it, and use it in avconv. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'd6604b29ef544793479d7fb4e05ef6622bb3e534'Michael Niedermayer2015-07-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd6604b29ef544793479d7fb4e05ef6622bb3e534': Gather all coded_frame allocations and free functions to a single place Conflicts: libavcodec/a64multienc.c libavcodec/asvenc.c libavcodec/cljrenc.c libavcodec/dpxenc.c libavcodec/dvenc.c libavcodec/gif.c libavcodec/huffyuvenc.c libavcodec/jpeglsenc.c libavcodec/libopenjpegenc.c libavcodec/libtheoraenc.c libavcodec/libvpxenc.c libavcodec/mpegvideo_enc.c libavcodec/nvenc.c libavcodec/pngenc.c libavcodec/proresenc_kostya.c libavcodec/sunrastenc.c libavcodec/tiffenc.c libavcodec/utils.c libavcodec/utvideoenc.c libavcodec/v210enc.c libavcodec/v410enc.c libavcodec/xbmenc.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * Gather all coded_frame allocations and free functions to a single placeVittorio Giovara2015-07-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Allocating coded_frame is what most encoders do anyway, so it makes sense to always allocate and free it in a single place. Moreover a lot of encoders freed the frame with av_freep() instead of the correct API av_frame_free(). This bring uniformity to encoder behaviour and prevents applications from erroneusly accessing this field when not allocated. Additionally this helps isolating encoders that export information with coded_frame, and heavily simplifies its deprecation. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '7fc8d8a1b3da1666176b3d92e989ee74f3ef014e'Michael Niedermayer2015-07-20
|\| | | | | | | | | | | | | * commit '7fc8d8a1b3da1666176b3d92e989ee74f3ef014e': libxvid: Do not entangle coded_frame Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * libxvid: Do not entangle coded_frameVittorio Giovara2015-07-20
| |
| * xvid: Check memory allocationVittorio Giovara2015-05-31
| |
* | avcodec/libxvid: remove now redundant init cleanup codeMichael Niedermayer2015-04-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '18db1286b04557aa2d2df7efbcb65ae825d5a469'Michael Niedermayer2015-04-24
|\| | | | | | | | | | | | | | | | | | | * commit '18db1286b04557aa2d2df7efbcb65ae825d5a469': libxvid: Make codec use the init-cleanup flag and mark it as init-thread-safe Conflicts: libavcodec/libxvid.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libxvid: Make codec use the init-cleanup flag and mark it as init-thread-safeVittorio Giovara2015-04-24
| | | | | | | | This takes care of memory leaks on init error.
| * libxvid: Return meaningful error messagesHimangi Saraogi2015-02-17
| |
* | avcodec/libxvid: fix potential integer overflowMichael Niedermayer2015-01-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/libxvid: check for av_malloc*() failuresMichael Niedermayer2015-01-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc/libxvid: workaround for bug in libxvidcoreLukasz Marek2014-12-05
| | | | | | | | | | | | | | | | | | | | libxvidcore calculate number of threads basing on video height. If height is small enough it allocates 0 bytes long memory and writes to it. Setting thread_count to 0 uses 1 thread and skips bugged code. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc/libxvid: return meaningful error codesLukasz Marek2014-11-25
| | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | lavc/libxvid: fix mem leak in case of init failureLukasz Marek2014-11-24
| | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | Merge commit '0a024268261d05ccdcf7e03c85fb78d22037a464'Michael Niedermayer2014-08-26
|\| | | | | | | | | | | | | | | | | | | | | * commit '0a024268261d05ccdcf7e03c85fb78d22037a464': libxvid: K&R formatting cosmetics Conflicts: libavcodec/libxvid.c libavcodec/libxvid_rc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libxvid: K&R formatting cosmeticsGabriel Dume2014-08-26
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867'Michael Niedermayer2014-08-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867': cosmetics: Write NULL pointer inequality checks more compactly Conflicts: libavcodec/dvdsubdec.c libavcodec/h263dec.c libavcodec/libxvid.c libavcodec/rv10.c libavcodec/utils.c libavformat/format.c libavformat/matroskadec.c libavformat/segment.c libavutil/opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Write NULL pointer inequality checks more compactlyGabriel Dume2014-08-15
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'Michael Niedermayer2014-08-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39': cosmetics: Write NULL pointer equality checks more compactly Conflicts: cmdutils.c ffmpeg_opt.c ffplay.c libavcodec/dvbsub.c libavcodec/dvdsubdec.c libavcodec/dvdsubenc.c libavcodec/dxa.c libavcodec/libxvid_rc.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/rv10.c libavcodec/tiffenc.c libavcodec/utils.c libavcodec/vc1dec.c libavcodec/zmbv.c libavdevice/v4l2.c libavformat/matroskadec.c libavformat/movenc.c libavformat/sdp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Write NULL pointer equality checks more compactlyGabriel Dume2014-08-15
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | msvc: fix implicitly declared read/close.Matthew Oliver2014-08-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '67bc1ba5d75953d136bfa02ce6c0a27e9fd9dac3'Michael Niedermayer2014-07-22
|\| | | | | | | | | | | | | * commit '67bc1ba5d75953d136bfa02ce6c0a27e9fd9dac3': libxvid: Drop PPC-specific CPU detection hack Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libxvid: Drop PPC-specific CPU detection hackDiego Biurrun2014-07-22
| | | | | | | | It is doubtful if the hack (still) works and Xvid had ten years to fix it.
* | avcodec/libxvid: add HAVE_UNISTD_H around #include <unistd.h>Michael Niedermayer2014-07-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/libxvid: improve return codesMichael Niedermayer2014-05-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '6484149158b6fc6d13d2b2ef84cb26a2d3275400'Michael Niedermayer2014-05-01
|\| | | | | | | | | | | | | | | | | | | | | * commit '6484149158b6fc6d13d2b2ef84cb26a2d3275400': lavc: make the xvid-specific "gmc" flag a private option of libxvid Conflicts: libavcodec/libxvid.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: make the xvid-specific "gmc" flag a private option of libxvidAnton Khirnov2014-05-01
| |
| * libxvid: fix missing end of line characterVittorio Giovara2014-04-07
| | | | | | | | Error introduced in 5ce7ca68b86856ee8e9d6530dffdadc4eca4f8d1.
* | Merge commit 'c389a804943095ebf078daec6b64690d2c97069c'Michael Niedermayer2014-04-07
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'c389a804943095ebf078daec6b64690d2c97069c': libxvid: Add SSIM displaying through a libxvidcore plugin Conflicts: libavcodec/libxvid.c libavcodec/version.h See: 3b3c1ed0768af874c624cc555fbbd1fcea370200 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libxvid: Add SSIM displaying through a libxvidcore pluginTimothy Gu2014-04-06
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '5ce7ca68b86856ee8e9d6530dffdadc4eca4f8d1'Michael Niedermayer2014-04-07
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '5ce7ca68b86856ee8e9d6530dffdadc4eca4f8d1': libxvid: add working lumimasking and variance AQ Conflicts: libavcodec/libxvid.c libavcodec/version.h See: ccb212b6c3ed18c9ff4e0c982574c43f92657f9f Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libxvid: add working lumimasking and variance AQTimothy Gu2014-04-06
| | | | | | | | | | | | | | The old implementation is unusable due to changes in the Xvid API. Further fixes by Michael Niedermayer <michaelni@gmx.at>. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Fix libxvid crash on failing initialisation.Carl Eugen Hoyos2014-01-17
| | | | | | | | Fixes ticket #3297.
* | Merge commit 'ffe04c330335add4c6d70ab0bb98e6b3f4f7abfa'Michael Niedermayer2013-11-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ffe04c330335add4c6d70ab0bb98e6b3f4f7abfa': libxvid: use the AVFrame API properly. pcxenc: use the AVFrame API properly. roqvideo: remove unused variables libschroedingerenc: use the AVFrame API properly. Conflicts: libavcodec/pcxenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libxvid: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
* | Merge commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2'Michael Niedermayer2013-10-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2': cosmetics: Group .name and .long_name together in codec/format declarations Conflicts: libavcodec/8svx.c libavcodec/alac.c libavcodec/cljr.c libavcodec/dnxhddec.c libavcodec/dnxhdenc.c libavcodec/dpxenc.c libavcodec/dvdec.c libavcodec/dvdsubdec.c libavcodec/dvdsubenc.c libavcodec/ffv1dec.c libavcodec/flacdec.c libavcodec/flvdec.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/g726.c libavcodec/gif.c libavcodec/gifdec.c libavcodec/h261dec.c libavcodec/h263dec.c libavcodec/iff.c libavcodec/imc.c libavcodec/libopencore-amr.c libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libspeexenc.c libavcodec/libvo-amrwbenc.c libavcodec/libvorbisenc.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/libxavs.c libavcodec/libxvid.c libavcodec/ljpegenc.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mpeg12dec.c libavcodec/mpeg4videodec.c libavcodec/msmpeg4dec.c libavcodec/pgssubdec.c libavcodec/pngdec.c libavcodec/pngenc.c libavcodec/proresdec_lgpl.c libavcodec/proresenc_kostya.c libavcodec/ra144enc.c libavcodec/rawdec.c libavcodec/rv10.c libavcodec/sp5xdec.c libavcodec/takdec.c libavcodec/tta.c libavcodec/v210dec.c libavcodec/vp6.c libavcodec/wavpack.c libavcodec/xbmenc.c libavcodec/yop.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Group .name and .long_name together in codec/format declarationsDiego Biurrun2013-10-03
| |
* | libxvid: guess a good aspect when we cant store the exact one.Carl Eugen Hoyos2013-09-08
| | | | | | | | Based on 394781a8.
* | libxvid: Reduce the size of an arrayTimothy Gu2013-08-05
| | | | | | | | | | | | It is not possible to have a plugin[] array with 5 or more elements. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/libxvid: Partially check plugins array size with assertMichael Niedermayer2013-08-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/libxvid: set lumi_aq for lumimaskingMichael Niedermayer2013-08-05
| | | | | | | | | | | | Simplifies check and should fix lumi+vari warning Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libxvid: cosmetics: Realign the codeTimothy Gu2013-08-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libxvid: Add SSIM displaying through a libxvidcore pluginTimothy Gu2013-07-31
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libxvid: add working lumimasking and variance AQTimothy Gu2013-07-31
| | | | | | | | | | | | The old implementation is unusable due to change in the Xvid API. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libxvid: cleanup on error pathesMichael Niedermayer2013-03-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libxvid: check & clear encoder_handleMichael Niedermayer2013-03-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libxvid: use av_freep() for safteyMichael Niedermayer2013-03-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>