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
2012-10-31ffv1: assert that there is at least one slicePaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-10-21Merge commit '2d09b36c0379fcda8f984bc8ad8816c8326fd7bd'Michael Niedermayer
* commit '2d09b36c0379fcda8f984bc8ad8816c8326fd7bd': doc/platform: Add info on shared builds with MSVC doc/platform: Move a caveat down to the notes section ARM: reinstate optimised intmath.h ffv1: update to ffv1 version 3 Conflicts: doc/platform.texi libavcodec/ffv1.c libavcodec/ffv1.h libavcodec/ffv1dec.c libavcodec/ffv1enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-21Merge commit '71f7b22dba60524b2285643ae0b49d8f64977129'Michael Niedermayer
* commit '71f7b22dba60524b2285643ae0b49d8f64977129': ffv1: split decoder and encoder Conflicts: libavcodec/Makefile libavcodec/ffv1.c libavcodec/ffv1.h libavcodec/ffv1dec.c libavcodec/ffv1enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-21ffv1: split decoder and encoderMichael Niedermayer
This is not based on lucas work due to code divergence (its less work this way than trying to merge from a split based on 2 years outdated code) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-21ffv1: fix grayMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-20ffv1: update to ffv1 version 3Luca Barbato
Based on code from Carl Eugen Hoyos, Michael Niedermayer and Paul B Mahol.
2012-10-20ffv1: split decoder and encoderLuca Barbato
2012-10-17Merge commit 'a25d912dca9cd553440167e0476c47581359c0fc'Michael Niedermayer
* commit 'a25d912dca9cd553440167e0476c47581359c0fc': avcodec_encode_audio(): fix invalid free pcm-mpeg: correct bitrate calculation ffv1: K&R formatting cosmetics fate: Add rangecoder test network: #include stdint.h in network.h nut: export codec_tag provided by rawvideo avserver: move avserver-specific code from ffmdec.c to avserver.c Conflicts: ffserver.c libavcodec/ffv1.c libavformat/ffmdec.c libavformat/nutenc.c tests/ref/lavfi/crop tests/ref/lavfi/crop_scale tests/ref/lavfi/crop_scale_vflip tests/ref/lavfi/crop_vflip tests/ref/lavfi/null tests/ref/lavfi/pixdesc tests/ref/lavfi/pixfmts_copy tests/ref/lavfi/pixfmts_crop tests/ref/lavfi/pixfmts_hflip tests/ref/lavfi/pixfmts_null tests/ref/lavfi/pixfmts_pad tests/ref/lavfi/pixfmts_scale tests/ref/lavfi/pixfmts_vflip tests/ref/lavfi/scale200 tests/ref/lavfi/scale500 tests/ref/lavfi/vflip tests/ref/lavfi/vflip_crop tests/ref/lavfi/vflip_vflip Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-17ffv1: fix packed rgb with 1.3Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-16ffv1: K&R formatting cosmeticsLuca Barbato
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2012-10-14ffv1: make sure gob_count is not 0Michael Niedermayer
Fixes division by 0 Fixes CID733736 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-13ffv1: avoid checking a double for equalityMichael Niedermayer
if 0.0 != 0.0 a out of array read would occur, equal checks with floating point may behave in such odd ways, though this is very unlikely in a real implementation of a compiler Fixes: CID718936 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-12lavc: do not use av_pix_fmt_descriptors directlyPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-10-08Merge commit '716d413c13981da15323c7a3821860536eefdbbb'Michael Niedermayer
* commit '716d413c13981da15323c7a3821860536eefdbbb': Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat Conflicts: doc/examples/muxing.c ffmpeg.h ffmpeg_filter.c ffmpeg_opt.c ffplay.c ffprobe.c libavcodec/8bps.c libavcodec/aasc.c libavcodec/aura.c libavcodec/avcodec.h libavcodec/avs.c libavcodec/bfi.c libavcodec/bmp.c libavcodec/bmpenc.c libavcodec/c93.c libavcodec/cscd.c libavcodec/cyuv.c libavcodec/dpx.c libavcodec/dpxenc.c libavcodec/eatgv.c libavcodec/escape124.c libavcodec/ffv1.c libavcodec/flashsv.c libavcodec/fraps.c libavcodec/h264.c libavcodec/huffyuv.c libavcodec/iff.c libavcodec/imgconvert.c libavcodec/indeo3.c libavcodec/kmvc.c libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libx264.c libavcodec/ljpegenc.c libavcodec/mjpegdec.c libavcodec/mjpegenc.c libavcodec/motionpixels.c libavcodec/mpeg12.c libavcodec/mpeg12enc.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo_enc.c libavcodec/pamenc.c libavcodec/pcxenc.c libavcodec/pgssubdec.c libavcodec/pngdec.c libavcodec/pngenc.c libavcodec/pnm.c libavcodec/pnmdec.c libavcodec/pnmenc.c libavcodec/ptx.c libavcodec/qdrw.c libavcodec/qpeg.c libavcodec/qtrleenc.c libavcodec/raw.c libavcodec/rawdec.c libavcodec/rl2.c libavcodec/sgidec.c libavcodec/sgienc.c libavcodec/snowdec.c libavcodec/snowenc.c libavcodec/sunrast.c libavcodec/targa.c libavcodec/targaenc.c libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/tmv.c libavcodec/truemotion2.c libavcodec/utils.c libavcodec/vb.c libavcodec/vp3.c libavcodec/wnv1.c libavcodec/xl.c libavcodec/xwddec.c libavcodec/xwdenc.c libavcodec/yop.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/buffersrc.c libavfilter/drawutils.c libavfilter/formats.c libavfilter/src_movie.c libavfilter/vf_ass.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_format.c libavfilter/vf_hflip.c libavfilter/vf_lut.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vf_transpose.c libavfilter/vf_yadif.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavformat/movenc.c libavformat/mxf.h libavformat/utils.c libavformat/yuv4mpeg.c libavutil/imgutils.c libavutil/pixdesc.c libswscale/input.c libswscale/output.c libswscale/swscale_internal.h libswscale/swscale_unscaled.c libswscale/utils.c libswscale/x86/swscale_template.c libswscale/x86/yuv2rgb.c libswscale/x86/yuv2rgb_template.c libswscale/yuv2rgb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-08Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormatAnton Khirnov
2012-10-08ffv1: fix array data typesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-06ffv1enc: fix assert in put_vlc_symbol() and update to av_assert2()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-06ffv1: change w/h asserts to check as the condition can likely happenMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-06ffv1: remove commented assertsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-03ffv1dec: print bps for pict debug tooMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-01Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: avcodec: Convert some commented-out printf/av_log instances to av_dlog avcodec: Drop silly and/or broken printf debug output avcodec: Drop some silly commented-out av_log() invocations avformat: Convert some commented-out printf/av_log instances to av_dlog avformat: Remove non-compiling and/or silly commented-out printf/av_log statements Remove some silly disabled code. ac3dec: ensure get_buffer() gets a buffer for the correct number of channels Conflicts: libavcodec/dnxhddec.c libavcodec/ffv1.c libavcodec/h264.c libavcodec/h264_parser.c libavcodec/mjpegdec.c libavcodec/motion_est_template.c libavcodec/mpegaudiodec.c libavcodec/mpegvideo_enc.c libavcodec/put_bits.h libavcodec/ratecontrol.c libavcodec/wmaenc.c libavdevice/timefilter.c libavformat/asfdec.c libavformat/avidec.c libavformat/avienc.c libavformat/flvenc.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-01avcodec: Convert some commented-out printf/av_log instances to av_dlogDiego Biurrun
2012-10-01avcodec: Drop silly and/or broken printf debug outputDiego Biurrun
2012-09-29ffv1enc: fix integer overflow with high resolutions and lots of slices.Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-26ffv1dec: support decoding older 1.3 bitstream variantMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-26ffv1:update copyright yearMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-25ffv1dec: change bitstream end check to a exact check instead of a +-1 checkMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-25ffv1: inject sentinels for RC->VLC transitions begining with 1.3Michael Niedermayer
This breaks bitstream compatibility of 1.3 VLC streams This fixes very rare errors in the RC stream at the transition point to VLC. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-25ffv1enc: fix RC slice sentinelMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-05Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'Michael Niedermayer
* commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9': avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member Conflicts: libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libx264.c libavcodec/mpeg12enc.c libavcodec/options_table.h libavcodec/snowenc.c libavcodec/tiffenc.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/af_amix.c libavfilter/af_asyncts.c libavfilter/af_join.c libavfilter/buffersrc.c libavfilter/src_movie.c libavfilter/vf_delogo.c libavfilter/vf_drawtext.c libavformat/http.c libavformat/img2dec.c libavformat/img2enc.c libavformat/movenc.c libavformat/mpegenc.c libavformat/mpegtsenc.c libavformat/options_table.h libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-03ffv1: fix 2 uninitialized variable warningsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-23ffv1: more than 8 bit per RGB channelGeorg Lippitsch
Add support for GBRP9, GBRP10, GBRP12 and GBRP14 pix formats in ffv1. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-08Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer
* 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>
2012-08-07Replace all CODEC_ID_* with AV_CODEC_ID_*Anton Khirnov
2012-07-27ffv1: Fix warnings about incompatible pointer type and discarded qualifiersjamal
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-16ffv1dec: fix error concealment for gop>1Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-16ffv1dec: detect errors in bytestream end mismatches for ECMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-16ffv1dec: set the first slices bytestream end correctlyMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-16ffv1dec: keep track of errors in slice headers for ECMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-16ffv1dec: add simple error concealment in case of CRC errors on slices.Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-16ffv1: keep last_frame (to be used for error concealment)Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-14ffv1enc: use default number of slices if unspecifiedMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-14ffv1dec: print timestamp at which a CRC mismatch happenedMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-10Set default ffv1 coder to -1.Carl Eugen Hoyos
Autoselect coder 1 instead of default coder if bits_per_raw_sample > 8. Fixes ticket #1519.
2012-07-10Cosmetics: Return AVERROR_INVALIDDATA from ffv1 encoder initialisation if ↵Carl Eugen Hoyos
invalid data was provided.
2012-07-10Cosmetics: Move ffv1 encoder initialisation code.Carl Eugen Hoyos
2012-06-13cosmetics: align more codecs declarationsPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-06-09ffv1enc: add yuva422p to .pix_fmtsPaul B Mahol
This was forgotten in 4e4634aa160ad0e27bee5e7809edbfcace08eba6. Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-06-04ffv1dec: print more information for -debug 1Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-04ffv1: fix log level of FF_DEBUG_PICT_INFOMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>