summaryrefslogtreecommitdiff
path: root/libavformat/md5enc.c
Commit message (Collapse)AuthorAge
* avformat/md5enc: add format, version and column headersMichael Niedermayer2013-10-26
| | | | | | See Ticket2280 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavf/md5enc: Use AV_HASH_MAX_SIZEJames Almer2013-06-15
| | | | | | | Also increase the buffer size in write_trailer(), since 128 is not enough anymore Signed-off-by: James Almer <jamrial@gmail.com>
* framemd5_class and md5enc_class may not be identical.Reimar Döffinger2013-05-24
| | | | | | | | | | | | | Due the crappy issue of classes having to be unique, we cannot even have classes with identical content, otherwise the compiler or linker is free to merge them, giving the same result and bugs as if we had only one class. Besides redesigning the option code to handle this correctly I see only the option of requiring any two classes to have different names, but the list of requirements for AVClasses is getting kind of unmanageable. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* md5enc: don't reuse priv_class in two formatsHendrik Leppkes2013-05-13
| | | | | | Apparently, this is not allowed and can trip up all sorts of things. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Add a generic hash API.Reimar Döffinger2013-05-13
| | | | | | Also use this API in framemd5. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* Merge commit 'c2cb01d418dd18e1cf997c038d37378d773121be'Michael Niedermayer2013-04-26
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c2cb01d418dd18e1cf997c038d37378d773121be': lavf: introduce AVFMT_TS_NEGATIVE Conflicts: libavformat/avformat.h libavformat/mux.c tests/ref/lavf/asf tests/ref/lavf/mkv tests/ref/lavf/mpg tests/ref/lavf/ts tests/ref/seek/lavf-asf tests/ref/seek/lavf-mkv tests/ref/seek/lavf-mpg tests/ref/seek/lavf-ts This commit does not change the default ts behaviour, such change will, if its done, be done separately. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: introduce AVFMT_TS_NEGATIVELuca Barbato2013-04-25
| | | | | | | | | | | | | | | | | | | | Most formats do not support negative timestamps, shift them to avoid unexpected behaviour and a number of bad crashes. CC:libav-stable@libav.org Signed-off-by: Anton Khirnov <anton@khirnov.net> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df'Michael Niedermayer2012-10-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df': tools: do not use av_pix_fmt_descriptors directly. pixdesc: add functions for accessing pixel format descriptors. build: add support for Tru64 (OSF/1) md5: Allocate a normal private context for the opaque md5 context pointer Conflicts: cmdutils.c doc/APIchanges ffprobe.c libavformat/md5enc.c libavutil/version.h tools/graph2dot.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * md5: Allocate a normal private context for the opaque md5 context pointerMartin Storsjö2012-10-11
| | | | | | | | | | | | | | | | This avoids having to overestimate the md5 context size, which isn't known beforehand, allowing us to use the new allocate functions instead. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer2012-08-07
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '36ef5369ee9b336febc2c270f8718cec4476cb85': Replace all CODEC_ID_* with AV_CODEC_ID_* lavc: add AV prefix to codec ids. Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/examples/muxing.c ffmpeg.c ffprobe.c ffserver.c libavcodec/8svx.c libavcodec/avcodec.h libavcodec/dnxhd_parser.c libavcodec/dvdsubdec.c libavcodec/error_resilience.c libavcodec/h263dec.c libavcodec/libvorbisenc.c libavcodec/mjpeg_parser.c libavcodec/mjpegenc.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/pcm.c libavcodec/r210dec.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/version.h libavdevice/alsa-audio-dec.c libavdevice/bktr.c libavdevice/v4l2.c libavformat/asfdec.c libavformat/asfenc.c libavformat/avformat.h libavformat/avidec.c libavformat/caf.c libavformat/electronicarts.c libavformat/flacdec.c libavformat/flvdec.c libavformat/flvenc.c libavformat/framecrcenc.c libavformat/img2.c libavformat/img2dec.c libavformat/img2enc.c libavformat/ipmovie.c libavformat/isom.c libavformat/matroska.c libavformat/matroskadec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/movenc.c libavformat/mp3dec.c libavformat/mpeg.c libavformat/mpegts.c libavformat/mxf.c libavformat/mxfdec.c libavformat/mxfenc.c libavformat/nsvdec.c libavformat/nut.c libavformat/oggenc.c libavformat/pmpdec.c libavformat/rawdec.c libavformat/rawenc.c libavformat/riff.c libavformat/sdp.c libavformat/utils.c libavformat/vocenc.c libavformat/wtv.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace all CODEC_ID_* with AV_CODEC_ID_*Anton Khirnov2012-08-07
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avformat: Drop pointless "format" from container long names swscale: bury one more piece of inline asm under HAVE_INLINE_ASM. wv: K&R formatting cosmetics configure: Add missing descriptions to help output h264_ps: declare array of colorspace strings on its own line. fate: amix: specify f32 sample format for comparison tiny_psnr: support 32-bit float samples eamad/eatgq/eatqi: call special EA IDCT directly eamad: remove use of MpegEncContext mpegvideo: remove unnecessary inclusions of faandct.h af_asyncts: avoid overflow in out_size with large delta values af_asyncts: add first_pts option Conflicts: configure libavcodec/eamad.c libavcodec/h264_ps.c libavformat/crcenc.c libavformat/ffmdec.c libavformat/ffmenc.c libavformat/framecrcenc.c libavformat/md5enc.c libavformat/nutdec.c libavformat/rawenc.c libavformat/yuv4mpeg.c tests/tiny_psnr.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Drop pointless "format" from container long namesDiego Biurrun2012-07-30
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: dwt: K&R prettyprinting cosmetics Remove libnut wrapper fate: change name of FATE samples location environment variable avformat: Add a flag to mark muxers that allow (non strict) monotone timestamps. http: Factorize the code by adding http_read_header() Conflicts: configure doc/APIchanges doc/fate.texi libavcodec/dwt.c libavcodec/dwt.h libavformat/Makefile libavformat/avformat.h libavformat/libnut.c libavformat/matroskaenc.c libavformat/utils.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Add a flag to mark muxers that allow (non strict) monotone timestamps.James Zern2012-05-20
| | | | | | | | Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: dsputil: remove debug message in dsputil_init(). movdec: Avoid av_malloc(0) in stss build: Drop YASM-OBJS-FFT from SUBDIR_VARS. build: Drop unused X86-OBJS variable. avconv: remove debugging cruft from do_video_out(). avconv: factorize setting stream_index for the output packet. frame{crc/md5}: set the stream timebase from codec timebase. apedec: remove unneeded #include of get_bits.h and associated macro apedec: av_fast_malloc() instead of av_realloc() apedec: fix handling of packet sizes that are not a multiple of 4 bytes Conflicts: libavcodec/apedec.c tests/ref/fate/4xm-1 tests/ref/fate/4xm-2 tests/ref/fate/aasc tests/ref/fate/armovie-escape124 tests/ref/fate/bethsoft-vid tests/ref/fate/cljr tests/ref/fate/creatureshock-avs tests/ref/fate/cscd tests/ref/fate/cvid-partial tests/ref/fate/deluxepaint-anm tests/ref/fate/dfa1 tests/ref/fate/dfa10 tests/ref/fate/dfa11 tests/ref/fate/dfa2 tests/ref/fate/dfa3 tests/ref/fate/dfa4 tests/ref/fate/dfa5 tests/ref/fate/dfa6 tests/ref/fate/dfa7 tests/ref/fate/dfa8 tests/ref/fate/dfa9 tests/ref/fate/film-cvid-pcm-stereo-8bit tests/ref/fate/flic-af11-palette-change tests/ref/fate/flic-magiccarpet tests/ref/fate/fraps-v2 tests/ref/fate/fraps-v3 tests/ref/fate/h264-lossless tests/ref/fate/interplay-mve-16bit tests/ref/fate/interplay-mve-8bit tests/ref/fate/mimic tests/ref/fate/motionpixels tests/ref/fate/mpeg2-field-enc tests/ref/fate/msvideo1-16bit tests/ref/fate/mtv tests/ref/fate/nuv tests/ref/fate/pictor tests/ref/fate/prores-alpha tests/ref/fate/ptx tests/ref/fate/qtrle-16bit tests/ref/fate/qtrle-1bit tests/ref/fate/quickdraw tests/ref/fate/rpza tests/ref/fate/sierra-vmd tests/ref/fate/targa-conformance-CCM8 tests/ref/fate/targa-conformance-UCM8 tests/ref/fate/tiertex-seq tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 tests/ref/fate/tscc-15bit tests/ref/fate/tscc-32bit tests/ref/fate/v210 tests/ref/fate/vc1-ism tests/ref/fate/vc1_sa00040 tests/ref/fate/vc1_sa00050 tests/ref/fate/vc1_sa10091 tests/ref/fate/vc1_sa20021 tests/ref/fate/vmnc-16bit tests/ref/fate/vmnc-32bit tests/ref/fate/vp5 tests/ref/fate/vp8-sign-bias tests/ref/fate/vqa-cc tests/ref/fate/wmv8-drm tests/ref/fate/yop tests/ref/fate/zmbv-8bit Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * frame{crc/md5}: set the stream timebase from codec timebase.Anton Khirnov2012-02-03
| | | | | | | | | | | | | | | | | | | | | | | | | | Right now those muxers use the default timebase in all cases(1/90000). This patch avoid unnecessary rescaling and makes the printed timestamps more readable. Also, extend the printed information to include the timebases and packet pts/duration and align the columns. Obviously changes the results of all fate tests which use those two muxers.
* | Use more designated initializers.Paul B Mahol2011-12-30
| | | | | | | | | | | | | | Also remove some pointless NULL/0 assigments. C++ code must be left as it is because named struct initializers are not supported by C++ standard.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: libavutil: add utility functions to simplify allocation of audio buffers. libavutil: add planar sample formats and av_sample_fmt_is_planar() avconv: fix segfault at EOF with delayed pictures pcmdec: remove unneeded resetting of samples pointer avconv: remove a now unused parameter from output_packet(). avconv: formatting fixes in output_packet() avconv: declare some variables in blocks where they are used avconv: use the same behavior when decoding audio/video/subs bethsoftvideo: return proper consumed size for palette packets. cdg: skip packets that don't contain a cdg command. crcenc: add flags avconv: use vsync 0 for AVFMT_NOTIMESTAMPS formats. tiffenc: add a private option for selecting compression algorithm md5enc: add flags ARM: remove needless .text/.align directives Conflicts: doc/APIchanges libavcodec/tiffenc.c libavutil/avutil.h libavutil/samplefmt.c libavutil/samplefmt.h tests/ref/fate/bethsoft-vid tests/ref/fate/cdgraphics tests/ref/fate/film-cvid-pcm-stereo-8bit tests/ref/fate/mpeg2-field-enc tests/ref/fate/nuv tests/ref/fate/tiertex-seq tests/ref/fate/tscc-32bit tests/ref/fate/vmnc-32bit Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * md5enc: add flagsAnton Khirnov2011-11-23
| | | | | | | | | | | | | | | | | | AVFMT_NOTIMESTAMPS for md5, as it ignores the timestamps. AVFMT_VARIABLE_FPS for framemd5, as it prints dts. -vsync 0 for the vp8 test is needed because with vsync 2 the timestamp guessing code gets confused by an altref frame that is never displayed and drops a frame later.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ffmpeg: fix some indentation ffmpeg: fix operation with --disable-avfilter simple_idct: remove disabled code motion_est: remove disabled code vc1: remove disabled code fate: separate lavf-mxf_d10 test from lavf-mxf cabac: Move code only used in the cabac test program to cabac.c. ffplay: warn that -pix_fmt is no longer working, suggest alternative ffplay: warn that -s is no longer working, suggest alternative lavf: rename enc variable in utils.c:has_codec_parameters() lavf: use designated initialisers for all (de)muxers. wav: remove a use of deprecated AV_METADATA_ macro rmdec: remove useless ap parameter from rm_read_header_old() dct-test: remove write-only variable des: fix #if conditional around P_shuffle Use LOCAL_ALIGNED in ff_check_alignment() Conflicts: ffmpeg.c libavformat/avidec.c libavformat/matroskaenc.c libavformat/mp3enc.c libavformat/oggenc.c libavformat/utils.c tests/ref/lavf/mxf Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: use designated initialisers for all (de)muxers.Anton Khirnov2011-07-17
| | | | | | | | It's more readable and less prone to breakage.
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
|/ | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* avio: rename put_flush_packet -> avio_flushAnton Khirnov2011-03-16
| | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* avio: avio: avio_ prefixes for put_* functionsAnton Khirnov2011-02-21
| | | | | | | | | | | | In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.Diego Elio Pettenò2011-01-26
| | | | | This also lists the objects from those two libraries as internal (by adding the ff_ prefix) so that they can then be hidden via linker scripts.
* Add -f framemd5 muxer similar to framecrc.Reimar Döffinger2010-05-24
| | | | Originally committed as revision 23289 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add a md5 muxer that allows checking the md5 sums of generated streams withoutReimar Döffinger2010-05-23
needing an external MD5 command. Originally committed as revision 23257 to svn://svn.ffmpeg.org/ffmpeg/trunk