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

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-12-31lavd/lavfi: fix compiler warning for uninitialized variablesJean First
Signed-off-by: Jean First <jeanfirst@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2011-12-22lavd/lavfi: fix two memleaks.Nicolas George
Signed-off-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2011-12-22libavdevice: increase LIBAVDEVICE_VERSION_MICRO to 100Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-20lavd/lavfi: reindent block in lavfi_read_headerStefano Sabatini
2011-12-20lavd/lavfi: add check in case pix_fmts cannot be allocated in ↵Stefano Sabatini
lavfi_read_header()
2011-12-18lavd/lavfi: fix incomplete commentStefano Sabatini
2011-12-18lavd/lavfi: fix typo in error messageStefano Sabatini
2011-12-16lavd/lavfi: remove a duplicated line.Nicolas George
2011-12-16libavdevice: Fix v4l2 compilation under FreeBSDTom Evans
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-14Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: ulti: Fix invalid reads lavf: dealloc private options in av_write_trailer yadif: support 10bit YUV vc1: mark with ER_MB_ERROR bits overconsumption lavc: introduce ER_MB_END and ER_MB_ERROR error_resilience: use the ER_ namespace build: move inclusion of subdir.mak to main subdir loop rv34: NEON optimised 4x4 dequant rv34: move 4x4 dequant to RV34DSPContext aacdec: Use intfloat.h rather than local punning union. Conflicts: libavcodec/h264.c libavcodec/vc1dec.c libavfilter/vf_yadif.c libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-14cleanup: for(intMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-13build: move inclusion of subdir.mak to main subdir loopMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-12-13Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: doxygen: misc consistency, spelling and wording fixes vcr1: drop unnecessary emms_c() calls without MMX code Replace all uses of av_close_input_file() with avformat_close_input(). lavf: add avformat_close_input(). lavf: deprecate av_close_input_stream(). lavf doxy: add some basic demuxing documentation. lavf doxy: add some general lavf information. lavf doxy: add misc utility functions to a group. lavf doxy: add av_guess_codec/format to the encoding group. lavf doxy: add core functions to a doxy group. Add basic libavdevice documentation. lavc: convert error_recognition to err_recognition. avconv: update -map option help text x86: Require 7 registers for the cabac asm x86: bswap: remove test for bswap instruction bswap: make generic implementation more compiler-friendly h264: remove useless cast proresdec: fix decode_slice() prototype Conflicts: configure doc/APIchanges ffprobe.c libavcodec/avcodec.h libavcodec/celp_math.h libavcodec/h264.c libavfilter/src_movie.c libavformat/anm.c libavformat/avformat.h libavformat/version.h libavutil/avstring.h libavutil/bswap.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-12Add basic libavdevice documentation.Anton Khirnov
2011-12-12Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: x86: cabac: replace explicit memory references with "m" operands avplay: don't request a stereo downmix wmapro: use av_float2int() lavc: avoid invalid memcpy() in avcodec_default_release_buffer() lavu: replace int/float punning functions lavfi: install libavfilter/vsrc_buffer.h Remove extraneous semicolons sdp: Restore the original mp4 format h264 extradata if converted rtpenc: Add support for mp4 format h264 rtpenc: Simplify code by introducing a separate end pointer movenc: Use the actual converted sample for RTP hinting Fix a bunch of common typos. Conflicts: doc/developer.texi doc/eval.texi doc/filters.texi doc/protocols.texi ffmpeg.c ffplay.c libavcodec/mpegvideo.h libavcodec/x86/cabac.h libavfilter/Makefile libavformat/avformat.h libavformat/cafdec.c libavformat/flvdec.c libavformat/flvenc.c libavformat/gxfenc.c libavformat/img2.c libavformat/movenc.c libavformat/mpegts.c libavformat/rtpenc_h264.c libavformat/utils.c libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-11Fix a bunch of common typos.Diego Biurrun
2011-12-08Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: drawtext: remove typo pcm-mpeg: implement new audio decoding api w32thread: port fixes to pthread_cond_broadcast() from x264. doc: add editor configuration section with Vim and Emacs settings dxva2.h: include d3d9.h to define LPDIRECT3DSURFACE9 avformat/utils: Drop unused goto label. doxygen: Replace '\' by '@' in Doxygen markup tags. cosmetics: drop some completely pointless parentheses cljr: simplify CLJRContext drawtext: introduce rand(min, max) drawtext: introduce explicit draw/hide variable rtmp: Use nb_invokes for all invoke commands Conflicts: libavcodec/mpegvideo.c libavfilter/vf_drawtext.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-07cosmetics: drop some completely pointless parenthesesDiego Biurrun
2011-12-06Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: mov: Don't av_malloc(0). avconv: only allocate 1 AVFrame per input stream avconv: fix memleaks due to not freeing the AVFrame for audio h264-fate: remove -strict 1 except where necessary (mr4/5-tandberg). misc Doxygen markup improvements doxygen: eliminate Qt-style doxygen syntax g722: Add a regression test for muxing/demuxing in wav g722: Change bits per sample to 4 g722dec: Signal skipping the lower bits via AVOptions instead of bits_per_coded_sample api-example: update to use avcodec_decode_audio4() avplay: use avcodec_decode_audio4() avplay: use a separate buffer for playing silence avformat: use avcodec_decode_audio4() in avformat_find_stream_info() avconv: use avcodec_decode_audio4() instead of avcodec_decode_audio3() mov: Allow empty stts atom. doc: document preferred Doxygen syntax and make patcheck detect it Conflicts: avconv.c ffplay.c libavcodec/mlpdec.c libavcodec/version.h libavformat/mov.c tests/codec-regression.sh tests/fate/h264.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-05misc Doxygen markup improvementsDiego Biurrun
2011-12-03lavf: rename remaining av_set_pts_info() to avpriv_set_pts_info().Clément Bœsch
2011-12-01Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: rtpdec: Templatize the code for different g726 bitrate variants rv40: move loop filter to rv34dsp context lavf: make av_set_pts_info private. rtpdec: Add support for G726 audio rtpdec: Add an init function that can do custom codec context initialization avconv: make copy_tb on by default. matroskadec: don't set codec timebase. rmdec: don't set codec timebase. avconv: compute next_pts from input packet duration when possible. lavf: estimate frame duration from r_frame_rate. avconv: update InputStream.pts in the streamcopy case. Conflicts: avconv.c libavdevice/alsa-audio-dec.c libavdevice/bktr.c libavdevice/fbdev.c libavdevice/libdc1394.c libavdevice/oss_audio.c libavdevice/v4l.c libavdevice/v4l2.c libavdevice/vfwcap.c libavdevice/x11grab.c libavformat/au.c libavformat/eacdata.c libavformat/flvdec.c libavformat/mpegts.c libavformat/mxfenc.c libavformat/rtpdec_g726.c libavformat/wtv.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-30lavf: make av_set_pts_info private.Anton Khirnov
It's supposed to be called only from (de)muxers.
2011-11-26Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: swscale: Readd #define _SVID_SOURCE Fix av_get_channel_layout_string() for positions >31 configure: Store vda lib flags in extralibs instead of ldflags Make channel layout masks unsigned dca: ARMv6 optimised decode_blockcode() nullenc: drop AVFMT_RAWPICTURE from the flags frame-mt: return consumed packet size in ff_thread_decode_frame aacdec: add more fate tests covering SBR and PS MK(BE)TAG: avoid undefined shifts Conflicts: configure libavcodec/arm/dca.h libavcodec/dca.c libavcodec/mlp_parser.c libavcodec/version.h libavfilter/asrc_anullsrc.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/defaults.c libavutil/audioconvert.c libavutil/avutil.h libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-25Make channel layout masks unsignedMans Rullgard
It makes more sense for a bit mask to use an unsigned type. The change should be source and binary compatible on all supported systems, hence micro version bump. Fixes a few invalid shifts. Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-11-21Fix various if parenthesis misplacements.Clément Bœsch
2011-11-15Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: binkvideo: simplify and remove invalid shifts pulse: compute frame_duration once and fix it lavf: simplify format_child_class_next() hwaccel: OS X Video Decoder Acceleration (VDA) support. doc: add support for an optional navigation bar in texi2html pages Conflicts: configure libavcodec/Makefile libavcodec/allcodecs.c libavcodec/vda.c libavcodec/vda.h libavcodec/vda_h264.c libavcodec/vda_internal.h libavcodec/version.h libavformat/options.c libavutil/avutil.h libavutil/pixfmt.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-14pulse: compute frame_duration once and fix itLuca Barbato
The frame duration was calculated without taking in account the bytes per sample. Thanks to Lorenzo Pistone <blaffablaffa@gmail.com> for pointing the issue and providing an initial fix.
2011-11-13Force opaque alpha channel for 32bit x11grab image.Carl Eugen Hoyos
Fixes ticket #163. Approved-by: Clemens Fruhwirth Approved-by: Edouard Gomez
2011-11-08v4l2: fix uninitialized variableMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-07Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (23 commits) x86inc: use sse versions of common macros instead of sse2 when applicable doc/APIchanges: add missing dates and hashes lavf: don't return from void av_update_cur_dts() Changelog: add more entries. Changelog: update ffmpeg/avconv incompatibility list. avconv: remove some redundant temporary variables. avconv: fix broken indentation avconv: move copy_initial_nonkeyframes to the options context. avconv: use file:stream instead of file.stream in log messages. doc/avconv: elaborate on basic functionality. doc/avconv: -sample_fmts, not -help sample_fmts prints the sample formats openssl: Only use CRYPTO_set_id_callback on OpenSSL < 1.0.0 Call avformat_network_init/deinit in the programs Remove leftover includes of strings.h avutil: Don't allow using strcasecmp/strncasecmp Replace all usage of strcasecmp/strncasecmp avstring: Add locale independent implementations of strcasecmp/strncasecmp avstring: Add locale independent implementations of toupper/tolower cosmetics: insert some spaces in explicit enum value assignments move 8SVX audio codecs to the audio codec list part on the next bump ... Conflicts: avprobe.c doc/APIchanges ffplay.c ffserver.c libavcodec/avcodec.h libavdevice/bktr.c libavdevice/v4l.c libavdevice/v4l2.c libavformat/matroskaenc.c libavformat/wtv.c libavutil/avstring.c libavutil/avstring.h libavutil/avutil.h libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-06dshow: support BI_BITFIELDS compression typeRamiro Polla
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-06Remove leftover includes of strings.hMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-11-06Replace all usage of strcasecmp/strncasecmpReimar Döffinger
All current usages of it are incompatible with localization. For example strcasecmp("i", "I") != 0 is possible, but would break many of the places where it is used. Instead use our own implementations that always treat the data as ASCII. Signed-off-by: Martin Storsjö <martin@martin.st>
2011-11-06dshow: don't print min/max values for fps the wrong way aroundRamiro Polla
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-06dshow: save opened device reference so it may be properly closedRamiro Polla
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-06dshow: release filter reference obtained from enumerationRamiro Polla
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-06dshow: indentRamiro Polla
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-06dshow: support choosing between devices with same nameRamiro Polla
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-05Make sdl_overlay_pix_fmt_map static const.Reimar Döffinger
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-11-05Make rgb_pixfmt_map const.Reimar Döffinger
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-11-05v4l2: add libv4l2 support.Clément Bœsch
2011-11-05Replace remaining av_new_stream() with avformat_new_stream().Clément Bœsch
2011-11-03Replace all strcasecmp/strncasecmp usages.Reimar Döffinger
All current usages of it are incompatible with localization. For example strcasecmp("i", "I") != 0 is possible, but would break many of the places where it is used. Instead use our own implementations that always treat the data as ASCII. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-10-30lavd: add v4l and v4l2 aliases.Clément Bœsch
2011-10-28Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: lavc: remove "legacy" mpegvideo decoder. iv8: assemble packets to return complete frames pulse: documentation pulse: introduce pulseaudio input remove the zork pcm seek test Conflicts: configure libavdevice/Makefile libavdevice/alldevices.c libavdevice/avdevice.h libavdevice/pulse.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-27Merge remote-tracking branch 'luzero/pulse'Michael Niedermayer
* luzero/pulse: pulse: set the device from the avformat filename Conflicts: libavdevice/pulse.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-27pulse: introduce pulseaudio inputLuca Barbato
It currently use the simple api and is using the latency information provided only to offset the stream start. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-10-26pulse: set the device from the avformat filenameLuca Barbato
Cleanup the options and add explicit fragment_size avoption.
2011-10-26pulse: Change application name to LIBAVFORMAT_IDENTMichael Niedermayer
This should be changed to LIBAVDEVICE_IDENT once it exists. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>