ac627b3d38
Merge commit '716d413c13981da15323c7a3821860536eefdbbb'
...
* 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-08 21:06:57 +02:00
51211d351c
vf_tile: fix typos/grammar in comments
...
Signed-off-by: Bobby Bingham <uhmmmm@gmail.com >
2012-10-06 11:34:10 -05:00
eb63a74789
Do not print debug output for the (MPlayer) pullup filter.
2012-10-05 21:03:59 +02:00
fb2e7ac3c4
lavfi/mp: drop rotate wrapper
...
The native filter transpose is perfectly equivalent.
2012-09-06 11:27:22 +02:00
9cdb5969d4
libmpcodecs: remove unused and half existing vo_fs variable
...
It breaks linking with suncc sometimes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-09-01 15:37:03 +02:00
d55252c331
lavfi/mp: remove decimate wrapper
...
It was natively integrated into libavfilter.
2012-09-01 09:26:12 +02:00
6c0107822d
lavfi/mp=decimate: fix off-by-one logic in diff_C() x loop
...
Set x offset values in the range 0-7, rather than in the range 8-1.
The y loop is changed accordingly, to avoid confusion.
This also fixes output difference with the new pending native decimate
filter.
2012-08-31 16:04:12 +02:00
e64b941dbc
lavfi/mp: remove smartblur filter
...
It was natively integrated into libavfilter.
2012-08-31 16:02:49 +02:00
dc7e4d685f
lavfi/mp: remove framestep wrapped filter
...
An equivalent framestep filter has been natively integrated.
2012-08-18 12:14:46 +02:00
6efce3a894
lavfi/mp: remove hue wrapped filter
...
hue was integrated as a native libavfilter filter.
2012-08-16 14:13:54 +02:00
7a72695c05
Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'
...
* 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-07 22:45:46 +02:00
9fb08427d7
vf_pp: dont pass NULL into pp, it would fail
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-07-07 19:14:51 +02:00
1c60088885
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
x86: Only use optimizations with cmov if the CPU supports the instruction
x86: Add CPU flag for the i686 cmov instruction
x86: remove unused inline asm macros from dsputil_mmx.h
x86: move some inline asm macros to the only places they are used
lavfi: Add the af_channelmap audio channel mapping filter.
lavfi: add join audio filter.
lavfi: allow audio filters to request a given number of samples.
lavfi: support automatically inserting the fifo filter when needed.
lavfi/audio: eliminate ff_default_filter_samples().
Conflicts:
Changelog
libavcodec/x86/h264dsp_mmx.c
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/version.h
libavutil/x86/cpu.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2012-06-24 02:09:53 +02:00
023c073076
add bracket around the argument (fixes compilation error with ICL)
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-06-09 00:34:21 +02:00
2cda0429aa
lavfi: remove screenshot libmpcodecs wrapper
...
The filter is useless.
Signed-off-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-05-02 18:15:29 +02:00
9750254885
lavfi/mp: remove libmpcodecs mirror filter
...
The native libavfilter hflip filter does the same thing.
2012-04-20 01:01:24 +02:00
5eeecde859
lavfi/mp: remove 2xsai wrapped filter
...
It was ported to a native libavfilter filter.
2012-04-13 00:14:06 +02:00
6cb01c9dba
lavfi/mp: remove remove_logo wrapper
...
removelogo has been ported to libavfilter, and the wrapper was not
working.
2012-04-07 13:57:39 +02:00
9e2ee46206
vf_fspp: add ff_ prefix to non static variables.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-03-14 23:06:00 +01:00
fa35ade8f9
vf_fspp: fix compilation with llvm
2012-03-14 22:35:15 +01:00
aefd1cb725
lavfi: remove swapuv libmpcodecs wrapper
...
The filter has been ported to a native libavfilter filter.
2012-03-10 00:10:44 +01:00
14aa1ba802
libmpcodecs/vf_pp: import memleak fix from MPlayer.
2012-03-04 19:36:24 +01:00
02670762d2
libavfilter/libmpcodecs: add vf_pp from current mplayer svn
...
This will allow us to do regression tests on libpostproc.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-02-26 20:39:32 +01:00
c84acc31b2
Revert "vf_fspp: use LOCAL_MANGLE instead of MANGLE."
...
This reverts commit 1aa8f5fcfb
2012-02-08 23:16:32 +01:00
1aa8f5fcfb
vf_fspp: use LOCAL_MANGLE instead of MANGLE.
...
The symbols are locals, thus the EXTERN_PREFIX should be omitted. This
might fix the llvm-gcc fate instance.
2012-02-08 19:45:39 +01:00
23b639c44f
Fix "ouput" typo and add a check.
2012-01-28 11:04:19 +01:00
e37f161e66
Merge remote-tracking branch 'qatar/master'
...
* qatar/master: (71 commits)
movenc: Allow writing to a non-seekable output if using empty moov
movenc: Support adding isml (smooth streaming live) metadata
libavcodec: Don't crash in avcodec_encode_audio if time_base isn't set
sunrast: Document the different Sun Raster file format types.
sunrast: Add a check for experimental type.
libspeexenc: use AVSampleFormat instead of deprecated/removed SampleFormat
lavf: remove disabled FF_API_SET_PTS_INFO cruft
lavf: remove disabled FF_API_OLD_INTERRUPT_CB cruft
lavf: remove disabled FF_API_REORDER_PRIVATE cruft
lavf: remove disabled FF_API_SEEK_PUBLIC cruft
lavf: remove disabled FF_API_STREAM_COPY cruft
lavf: remove disabled FF_API_PRELOAD cruft
lavf: remove disabled FF_API_NEW_STREAM cruft
lavf: remove disabled FF_API_RTSP_URL_OPTIONS cruft
lavf: remove disabled FF_API_MUXRATE cruft
lavf: remove disabled FF_API_FILESIZE cruft
lavf: remove disabled FF_API_TIMESTAMP cruft
lavf: remove disabled FF_API_LOOP_OUTPUT cruft
lavf: remove disabled FF_API_LOOP_INPUT cruft
lavf: remove disabled FF_API_AVSTREAM_QUALITY cruft
...
Conflicts:
doc/APIchanges
libavcodec/8bps.c
libavcodec/avcodec.h
libavcodec/libx264.c
libavcodec/mjpegbdec.c
libavcodec/options.c
libavcodec/sunrast.c
libavcodec/utils.c
libavcodec/version.h
libavcodec/x86/h264_deblock.asm
libavdevice/libdc1394.c
libavdevice/v4l2.c
libavformat/avformat.h
libavformat/avio.c
libavformat/avio.h
libavformat/aviobuf.c
libavformat/dv.c
libavformat/mov.c
libavformat/utils.c
libavformat/version.h
libavformat/wtv.c
libavutil/Makefile
libavutil/file.c
libswscale/x86/input.asm
libswscale/x86/swscale_mmx.c
libswscale/x86/swscale_template.c
tests/ref/lavf/ffm
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2012-01-28 07:53:34 +01:00
96949dafcc
Replace all strcasecmp/strncasecmp usages.
...
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-11-03 19:25:26 +01:00
7491816010
libavfilter/libmpcodecs: add vf_stereo3d support
...
(code from mplayer see their svn for detailed authorship)
parameters must be integers as we do not have mplayers parser
also the stuff passed to it through non constant globals is not supported
this should be fixed in mplayer first.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2011-09-20 05:49:42 +02:00
5aa18fed84
libmpcodecs: some hunks from mplayer HEAD
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2011-09-20 05:14:52 +02:00
39e0accb7a
vf_remove_logo: domt access vf->next->query_format() directly but use the API.
...
This fixes a crash
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2011-09-13 03:52:30 +02:00
6e89bdfecf
lavfi: remove delogo mp wrapper
...
The delogo filter has been natively integrated into libavfilter,
simplify.
2011-08-14 12:26:44 +02:00
e72657f83d
lavfi: remove mp test wrapper
...
The source was natively integrated into libavfilter, with the name
mptestsrc.
2011-08-11 16:19:53 +02:00
640a905ece
lavfi: remove gradfun mp wrapper
...
The gradfun filter was already integrated natively in libavfilter.
Both filters issue the same output, and have a comparable performance.
See thread:
Subject: [FFmpeg-devel] [PATCH] lavfi: remove gradfun mp wrapper
Date: Fri, 5 Aug 2011 00:19:04 +0200
2011-08-07 17:43:02 +02:00
cc0dc50d02
vf_mp: remove blackframe filter wrapper
...
blackframe is integrated as a native filter.
2011-07-23 10:55:50 +02:00
8c2863b87f
vf_mp: remove cropdetect wrapper
...
The cropdetect filter is natively integrated into libavfilter.
2011-07-21 13:04:48 +02:00
b43ca2deb6
vf_mp: remove rgbtest wrapper
...
The filter was integrated natively into libavfilter as a source with
name rgbtestsrc.
2011-07-15 01:44:57 +02:00
4bd28579e5
vf_mp: remove boxblur wrapper
...
It is natively included in libavfilter.
2011-07-15 01:06:00 +02:00
58fd70b04d
Port remove of get_sws_cpuflags from MPlayer's libmpcodecs.
2011-06-02 08:38:09 +02:00
3379531c40
Port recent changes to MPlayer libmpcodecs.
...
Also include an older fix for vf_smartblur which was essentially
broken due to reading the threshold value wrongly.
2011-06-02 08:38:09 +02:00
2a30df09fd
Replace non-existent HAVE_SSE2 with HAVE_SSE.
...
Since this is only a compilation check (the actual function used is
selected at runtime) and HAVE_SSE indicates that we can also compile
SSE2 code, this is correct.
2011-06-02 08:38:08 +02:00
a52f598d63
Port libmpcodec fixes from MPlayer.
2011-05-31 07:40:20 +02:00
6841c8c579
Merge remote branch 'qatar/master'
...
* qatar/master:
log: Fix an oob array read.
cosmetics: trim trailing whitespace in postproc
Ban strncpy() it's too easy to misuse.
psymodel: Remove wrapper functions.
aacenc: Replace loop counters in aac_encode_frame() with more descriptive 'ch' and 'w'.
regtest: remove redundant flags in jpg test
regtest: use run_ffmpeg in do_image_formats
regtest: simplify encoding functions
ffmpeg.c: check for interlaced flag in the correct place.
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2011-05-09 04:50:56 +02:00
e40cfb1463
mp: remove use of deprecated old eval API
...
The old API was deprecated and will be possibly removed, fix warnings
in libavfilter/libmpcodecs/vf_geq.c and libavfilter/libmpcodecs/vf_qp.c.
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it >
2011-04-21 18:45:56 +02:00
0bfe349d4a
Update to latest MPlayer version.
...
Avoids warnings due to pointlessly casting away const.
2011-03-25 19:05:02 +01:00
3660b5bca9
remove definition of swab
...
right now swab is defined in libavfilter/libmpcodecs/mpbswap.h
this breaks mingw32 cross compiles. since it its not used, it should be
removed. alternatively swab has to be added to HAVE_LIST in configure.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2011-03-17 19:09:45 +01:00
69aab68037
Use av_strdup instead of strdup, fixes mingw build
2011-03-16 14:26:25 -07:00
55fa97e215
Remove useage of memalign() from libmpcodecs, not all platforms have memalign().
2011-01-28 21:55:23 +01:00
a61b0df708
Add ASMALIGN() hack to patch around its recent removial from configure
2011-01-20 03:27:01 +01:00
3be78f7ecd
Hack libmpcodecs to make it buildable.
2011-01-20 00:59:30 +01:00
