Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-09-05Remove left-over FF_API_DESTRUCT_PACKET cruftHendrik Leppkes
2015-09-05Merge commit '01bcc2d5c23fa757d163530abb396fd02f1be7c8'Hendrik Leppkes
* commit '01bcc2d5c23fa757d163530abb396fd02f1be7c8': lavc: Drop deprecated destruct_packet related functions Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-08-28lavc: Drop deprecated destruct_packet related functionsVittorio Giovara
Deprecated in 10/2012.
2015-07-28Merge commit '059a934806d61f7af9ab3fd9f74994b838ea5eba'Michael Niedermayer
* commit '059a934806d61f7af9ab3fd9f74994b838ea5eba': lavc: Consistently prefix input buffer defines Conflicts: doc/examples/decoding_encoding.c libavcodec/4xm.c libavcodec/aac_adtstoasc_bsf.c libavcodec/aacdec.c libavcodec/aacenc.c libavcodec/ac3dec.h libavcodec/asvenc.c libavcodec/avcodec.h libavcodec/avpacket.c libavcodec/dvdec.c libavcodec/ffv1enc.c libavcodec/g2meet.c libavcodec/gif.c libavcodec/h264.c libavcodec/h264_mp4toannexb_bsf.c libavcodec/huffyuvdec.c libavcodec/huffyuvenc.c libavcodec/jpeglsenc.c libavcodec/libxvid.c libavcodec/mdec.c libavcodec/motionpixels.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/noise_bsf.c libavcodec/nuv.c libavcodec/nvenc.c libavcodec/options.c libavcodec/parser.c libavcodec/pngenc.c libavcodec/proresenc_kostya.c libavcodec/qsvdec.c libavcodec/svq1enc.c libavcodec/tiffenc.c libavcodec/truemotion2.c libavcodec/utils.c libavcodec/utvideoenc.c libavcodec/vc1dec.c libavcodec/wmalosslessdec.c libavformat/adxdec.c libavformat/aiffdec.c libavformat/apc.c libavformat/apetag.c libavformat/avidec.c libavformat/bink.c libavformat/cafdec.c libavformat/flvdec.c libavformat/id3v2.c libavformat/isom.c libavformat/matroskadec.c libavformat/mov.c libavformat/mpc.c libavformat/mpc8.c libavformat/mpegts.c libavformat/mvi.c libavformat/mxfdec.c libavformat/mxg.c libavformat/nutdec.c libavformat/oggdec.c libavformat/oggparsecelt.c libavformat/oggparseflac.c libavformat/oggparseopus.c libavformat/oggparsespeex.c libavformat/omadec.c libavformat/rawdec.c libavformat/riffdec.c libavformat/rl2.c libavformat/rmdec.c libavformat/rtpdec_latm.c libavformat/rtpdec_mpeg4.c libavformat/rtpdec_qdm2.c libavformat/rtpdec_svq3.c libavformat/sierravmd.c libavformat/smacker.c libavformat/smush.c libavformat/spdifenc.c libavformat/takdec.c libavformat/tta.c libavformat/utils.c libavformat/vqf.c libavformat/westwood_vqa.c libavformat/xmv.c libavformat/xwma.c libavformat/yop.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27lavc: Consistently prefix input buffer definesVittorio Giovara
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-22Replace AV_PKT_DATA_QUALITY_FACTOR by AV_PKT_DATA_QUALITY_STATSMichael Niedermayer
The stats are a superset of the quality factor, also allowing the picture type and encoder "PSNR" stats to be exported This also replaces the native by fixed little endian order for the affected side data AV_PKT_DATA_QUALITY_FACTOR is left as a synonym of AV_PKT_DATA_QUALITY_STATS Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-05-07avcodec: Add av_packet_side_data_name()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-18Merge commit 'fe0f4e56577a2dbd373bb50b0ae2d49e69d822fc'Michael Niedermayer
* commit 'fe0f4e56577a2dbd373bb50b0ae2d49e69d822fc': avpacket: Check buffer reference Conflicts: libavcodec/avpacket.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-17avpacket: Check buffer referenceVittorio Giovara
CC: libav-stable@libav.org Bug-Id: CID 1267889
2014-12-12lavc/avpacket: check for malloc failurewm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-07avcodec/avpacket: use av_freep(), do not leave stale pointers in memoryMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-07avcodec/avpacket: simplify freeing pkt->dataMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-20Merge commit '874390e163427c1fe7682ab27924a7843780dbb3'Michael Niedermayer
* commit '874390e163427c1fe7682ab27924a7843780dbb3': lavc: add a convenience function for rescaling timestamps in a packet Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-20lavc: add a convenience function for rescaling timestamps in a packetAnton Khirnov
2014-05-19Merge commit 'cdf58f0599c39852ee3beafe5f64af7d57d4215b'Michael Niedermayer
* commit 'cdf58f0599c39852ee3beafe5f64af7d57d4215b': avpacket: fix copying side data in av_packet_copy_props() Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-19avpacket: fix copying side data in av_packet_copy_props()Anton Khirnov
Side data count is incremented by by calling av_packet_new_side_data() in the following loop, setting it explicitly results in the resulting value being twice what it should be. CC: libav-stable@libav.org
2014-04-08avcodec/avpacket: use av_malloc_array()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-04avcodec.h, avpacket.c: use const AVPacket pointers in copy functionsRoman Fietze
Signed-off-by: Roman Fietze <roman.fietze@telemotive.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-21avcodec: move end zeroing code from av_packet_split_side_data() to ↵Michael Niedermayer
avcodec_decode_subtitle2() This code changes the input packet, which is read only and can in rare circumstances lead to decoder errors. (i run into one of these in the audio decoder, which corrupted the packet during av_find_stream_info() so that actual decoding that single packet failed later) Until a better fix is implemented, this commit limits the problem. A better fix might be to make the subtitle decoders not depend on data[size] = 0 or to copy their input when this is not the case.
2013-11-20avcodec/avpacket: fix order of operations in case of too large allocationMichael Niedermayer
Found-by: wm4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-20avcodec/avpacket: use size_t, fix potential integer overflowMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-20avpacket: add pack/unpack functions for AVDictionaryBen Boeckel
These functions are intended for use with side_data which comes in an AVPacket. Signed-off-by: Ben Boeckel <mathstuf@gmail.com> Reviewed-by: wm4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-20avcodec/avpacket: correctly set the number of side data elements in ↵Michael Niedermayer
av_copy_packet_side_data() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-19avcodec/avpacket/av_packet_split_side_data: ensure that side data padding is ↵Michael Niedermayer
initialized Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-16Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: avpacket: Fix error checking in packet_alloc Conflicts: libavcodec/avpacket.c See: b905a7137a51a9a4f66d75172897d1f38c0b292a Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-16avpacket: Fix error checking in packet_allocMartin Storsjö
Previously the wrong buffer pointer was checked, when buf instead of *buf was checked. But checking the return value instead is even better. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-04avcodec/avpacket: zero memory in av_packet_new_side_data()Michael Niedermayer
This ensures that no uninitialized bytes cause non-deterministic behavior. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-02avpacket: Fixing side data copy when src == dstVignesh Venkatasubramanian
Fixing av_packet_copy_side_data to work correctly when source and destination are the same. This makes sure that there is no memory leak and double frees. Signed-off by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-30avcodec/avpacket: Use av_free_packet() in error cleanupsMichael Niedermayer
This prevents memleaks on errors reproduceable with fate when error pathes are forced Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-12avcodec: Remove ff_packet_free_side_data, use av_packet_free_side_dataMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-11avcodec/avpacket: Fix memory allocation failure checkMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-11Merge commit '5a9a9d4a2abefa63d9a898ce26715453c569e89d'Michael Niedermayer
* commit '5a9a9d4a2abefa63d9a898ce26715453c569e89d': lavc: Add refcounted api to AVPacket Conflicts: libavcodec/avpacket.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-10lavc: Add refcounted api to AVPacketLuca Barbato
Provide a clean way to manipulate packets.
2013-08-03Merge commit '7950e519bb094897f957b9a9531cc60ba46cbc91'Michael Niedermayer
* commit '7950e519bb094897f957b9a9531cc60ba46cbc91': Disable deprecation warnings for cases where a replacement is available Conflicts: libavcodec/avpacket.c libavcodec/pthread.c libavcodec/utils.c libavdevice/v4l2.c libavfilter/avfiltergraph.c libavfilter/buffersrc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-02Disable deprecation warnings for cases where a replacement is availableDiego Biurrun
2013-06-01lavc/avpacket: fill padding area on side data split.Clément Bœsch
The padding data is assumed to be 0 in several places, notably in subtitles. This problem was not detected with fate-sub-srt test because the first element of the side data (x1) is 0 in the test, so the trailing side data present in the packet wasn't read by the decoder. The issue can be observed with a large enough x1. It is also noted in FF_INPUT_BUFFER_PADDING_SIZE doxy that MPEG bitstreams require that padding with 0, so it might fix other issues.
2013-05-15avcodec/avpacket: Refactoring copy_side_data into a separate functionVignesh Venkatasubramanian
Refactoring copy_side_data into a separate function so that it can be called in cases where side data needs to be duplicated. Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-29copy_packet_data: fix memleakMichael Niedermayer
This should fix gif fate memleaks Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13avpacket: copy side data type and size in av_dup_packetJanne Grunau
2013-03-13avpacket: do not copy data when buf ref is available.Clément Bœsch
This at least fixes issues with lavf/subtitles. The behaviour of av_dup_packet() is unchanged, only av_copy_packet() is affected.
2013-03-08Merge commit '1afddbe59e96af75f1c07605afc95615569f388f'Michael Niedermayer
* 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>
2013-03-08avpacket: use AVBuffer to allow refcounting the packets.Anton Khirnov
This will allow us to avoid copying the packets in many cases. This breaks ABI.
2013-01-14Merge commit '90cfc084e3e6d37ab88fc96a95f0401d8e8b4cd1'Michael Niedermayer
* commit '90cfc084e3e6d37ab88fc96a95f0401d8e8b4cd1': avpacket: free side data in av_free_packet(). v4l2: do not assert on a value received from outside of Libav v4l2: set the average framerate instead of codec timebase. Conflicts: libavcodec/avpacket.c libavdevice/v4l2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-13avpacket: free side data in av_free_packet().Anton Khirnov
Freeing it in av_destruct_packet(), as is done currently, would mean that we allow it to be allocated with other means. But that would make av_packet_new_side_data() unsafe. Side data is not expected to be large, so copying it if required shouldn't be a problem.
2012-09-21Add av_copy_packet()Andrey Utkin
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-21Move av_dup_packet() copy logic to separate procedureAndrey Utkin
Done to simplify next commit introducing av_copy_packet() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-18When copying pkt side_data, don't forget size, typeAndrey Utkin
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-16Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b'Michael Niedermayer
* commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b': avformat: fix typo in avformat_close_input mp3enc: write Xing TOC mp3enc: support MPEG-2 and MPEG-2.5 in Xing header. mp3enc: downgrade some errors in writing Xing frame to warnings lavf: flush the output AVIOContext in av_write_trailer(). lavf: cosmetics, reformat av_write_trailer(). avio: flush the internal buffer in avio_close() Enhance doc on asyncts audiofilter cmdutils: avoid setting data pointers to invalid values in alloc_buffer() libavcodec: remove av_destruct_packet_nofree() Conflicts: libavcodec/avpacket.c libavformat/mp3enc.c libavformat/nutenc.c libavformat/utils.c libavformat/version.h tests/ref/lavf/voc tests/ref/lavf/voc_s16 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-15libavcodec: remove av_destruct_packet_nofree()Mans Rullgard
This function was deprecated two major versions ago (2009). Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-08-16Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: Fix even more missing includes after the common.h removal build: Factor out rangecoder dependencies to CONFIG_RANGECODER build: Factor out error resilience dependencies to CONFIG_ERROR_RESILIENCE x86: avcodec: Consistently name all init files Add more missing includes after removing the implicit common.h Add some more missing includes after removing the implicit common.h Don't include common.h from avutil.h rtmp: Automatically compute the hash for SWFVerification Conflicts: configure doc/APIchanges doc/examples/decoding_encoding.c libavcodec/Makefile libavcodec/assdec.c libavcodec/audio_frame_queue.c libavcodec/avpacket.c libavcodec/dv_profile.c libavcodec/dwt.c libavcodec/libtheoraenc.c libavcodec/rawdec.c libavcodec/rv40dsp.c libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/v210dec.h libavcodec/vc1dsp.c libavcodec/x86/Makefile libavfilter/asrc_anullsrc.c libavfilter/avfilter.c libavfilter/buffer.c libavfilter/formats.c libavfilter/vf_ass.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_select.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavformat/version.h libavutil/audioconvert.c libavutil/error.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>