Robert Nagy
a07578f3f2
vf_yadif: fix missing error handling for avfilter_poll_frame()
2012-05-07 10:26:57 +02:00
Robert Nagy
4f5c5416ca
yadif: Add yuva444p to format list.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-07 00:06:10 +02:00
Robert Nagy
e90dfa6881
yadif: Improve pts calculation for is_second.
...
Tested-by: Robert Nagy <ronag89@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-17 19:41:16 +02:00
Robert Nagy
4d84c7ded6
yadif: fixed missing error handling for poll_frame.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-15 23:44:38 +02:00
Nicolas George
1ea3b657d6
vf_yadif: accept input with several frames available.
...
Fixes ticket #1040 .
2012-03-07 17:36:04 +01:00
Michael Niedermayer
04b53746ad
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
rtpdec: Use 4 byte startcodes for H.264
matroskadec: Mark variable as av_unused.
Move some conditionally used variables into the block where they are used.
Drop some completely unnecessary av_unused attributes.
swscale: Remove unused variable alpMmxFilter.
Drop unnecessary av_uninit attributes from some variable declarations.
movenc: Support muxing wmapro in ismv/isma
mpegtsenc: Add an AVOption for forcing a new PAT/PMT/SDT to be written
swscale: move YUV2PACKED16WRAPPER() macro down to where it is used.
swscale: handle gray16 as a "planar" YUV format (Y-only, of course).
swscale: use yuv2packed1() functions for unscaled chroma also.
swscale: fix incorrect chroma bias in yuv2rgb48_1_c().
swscale: fix invalid memory accesses in yuvpacked1() functions.
Move PS2 MMI code below the mips subdirectory, where it belongs.
mips: Move MMI function declarations to a header.
build: Set correct dependencies for rtmp* protocols implemented by librtmp.
Conflicts:
libavcodec/ac3enc_template.c
libavformat/mpegtsenc.c
libswscale/output.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-14 01:53:31 +01:00
Diego Biurrun
7331b6e718
Drop some completely unnecessary av_unused attributes.
2012-02-13 19:20:53 +01:00
Clément Bœsch
9d35fa43ee
lavfi: add missing periods in descriptions.
2012-01-20 00:16:27 +01:00
Michael Niedermayer
3ba0bfe71f
Merge remote-tracking branch 'qatar/master'
...
* 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-13 23:21:37 +01:00
Luca Barbato
d32eed5c73
yadif: support 10bit YUV
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-12-13 17:02:55 +01:00
Michael Niedermayer
393b234fa1
yadif, its 2011
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-11 17:06:47 +01:00
Michael Niedermayer
825481e87b
yadif: reject reuse2 buffers as we cant use frames that change under our
...
fingers.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-11 17:06:07 +01:00
Reimar Döffinger
5af7daabc4
Mark AVFilterPad[] compound literals as const.
...
GCC 4.6.2 at least still seems to fail to put them in .rodata though,
see also http://gcc.gnu.org/bugzilla/show_bug.cgi?id=37303
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-11-06 00:05:14 +01:00
Michael Niedermayer
abe9c54f14
yadif: Fix assignment from incompatible pointer type warning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-18 23:59:20 +02:00
Stefano Sabatini
be4e8908d2
vf_yadif: add support to yuva420p
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-09-21 09:00:24 +02:00
Stefano Sabatini
4703a7b50b
vf_yadif: correct documentation on the parity parameter
...
0 is top-field-first, 1 is bottom-field-first, not the other way
around.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-09-21 08:59:58 +02:00
Joakim Plate
5feb67f8a1
vf_yadif: copy buffer properties like aspect for second frame as well
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-09-21 08:59:36 +02:00
Joakim Plate
ab09df9dea
vf_yadif: add an option to enable/disable deinterlacing based on src frame "interlaced" flag
...
Signed-off-by: Joakim Plate <elupus@ecce.se>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-09-19 12:44:22 +02:00
Stefano Sabatini
22ee131e85
vf_yadif: add support to yuva420p
2011-08-31 16:11:26 +02:00
Stefano Sabatini
82b1516a85
yadif: correct documentation on the parity parameter
...
0 is top-field-first, 1 is bottom-field-first, not the other way
around.
Fix trac issue #380 .
2011-08-04 19:09:57 +02:00
Joakim Plate
faa338183b
yadif must copy buffer properties like aspect for second frame as well
2011-07-28 03:47:53 +02:00
Joakim Plate
2a375bb400
Add mode to yadif to enable/disable deinterlacing based on src frame "interlaced" flag
...
Signed-off-by: Joakim Plate <elupus@ecce.se>
2011-07-03 13:19:44 +02:00
Mina Nagy Zaki
fd2c0a5db2
lavfi: add layout negotiation fields and helper functions.
2011-06-19 22:58:32 +02:00
Michael Niedermayer
d7e5aebae7
Merge remote branch 'qatar/master'
...
* qatar/master: (23 commits)
ac3enc: correct the flipped sign in the ac3_fixed encoder
Eliminate pointless '#if 1' statements without matching '#else'.
Add AVX FFT implementation.
Increase alignment of av_malloc() as needed by AVX ASM.
Update x86inc.asm from x264 to allow AVX emulation using SSE and MMX.
mjpeg: Detect overreads in mjpeg_decode_scan() and error out.
documentation: extend documentation for ffmpeg -aspect option
APIChanges: update commit hashes for recent additions.
lavc: deprecate FF_*_TYPE macros in favor of AV_PICTURE_TYPE_* enums
aac: add headers needed for log2f()
lavc: remove FF_API_MB_Q cruft
lavc: remove FF_API_RATE_EMU cruft
lavc: remove FF_API_HURRY_UP cruft
pad: make the filter parametric
vsrc_movie: add key_frame and pict_type.
vsrc_movie: fix leak in request_frame()
lavfi: add key_frame and pict_type to AVFilterBufferRefVideo.
vsrc_buffer: add sample_aspect_ratio fields to arguments.
lavfi: add fieldorder filter
scale: make the filter parametric
...
Conflicts:
Changelog
doc/filters.texi
ffmpeg.c
libavcodec/ac3dec.h
libavcodec/dsputil.c
libavfilter/avfilter.h
libavfilter/vf_scale.c
libavfilter/vf_yadif.c
libavfilter/vsrc_buffer.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-27 03:51:04 +02:00
James Darnley
b137bf7df3
yadif: support 16-bit
...
Fixes by Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-04-26 07:21:40 +02:00
James Darnley
88312a4de3
yadif: support more than yuv420p.
...
and correctly support grey8
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-04-26 07:15:54 +02:00
Michael Niedermayer
d85e18e6e3
yadif: Fix assert() failure
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-04-26 07:15:10 +02:00
Michael Niedermayer
14e3b120ad
Reduce picture size for yadif.
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-04-20 17:38:19 +02:00
Michael Niedermayer
eb79c528d8
Update yadif copyright header
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-05 03:21:36 +02:00
James Darnley
de0f445b5c
Factorise the C filtering in yadif
2011-04-05 03:21:36 +02:00
Michael Niedermayer
2657fd0cd4
Yadif fixes that where missing from the patch
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-05 03:21:36 +02:00
James Darnley
457be6962b
Support 16-bit in yadif
2011-04-05 03:21:36 +02:00
James Darnley
257ac5f1d6
support more than yuv420p in yadif
...
(and correctly support grey8)
2011-04-05 03:21:36 +02:00
Michael Niedermayer
233ed6b314
Change yadif to not use out of picture lines.
...
Fixes issue2272.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-04-03 08:46:19 +02:00
Michael Niedermayer
679191a5df
yadif:Fix assert() failure
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-02 20:27:07 +02:00
Mans Rullgard
2912e87a6c
Replace FFmpeg with Libav in licence headers
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
Mans Rullgard
49e617f956
yadif: add parens around macro parameters
...
This fixes compilation with preprocessors which do not add whitespace
around replaced tokens, resulting in invalid expressions like 1--1.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-08 02:08:31 +01:00
Mans Rullgard
391a1327bd
yadif: add parens around macro parameters
...
This fixes compilation with preprocessors which do not add whitespace
around replaced tokens, resulting in invalid expressions like 1--1.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-05 14:51:03 +00:00
Michael Niedermayer
02d0803571
Reduce picture size for yadif.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-02-18 19:39:56 +01:00
Michael Niedermayer
bad82d3d7d
Change yadif to not use out of picture lines.
...
Fixes issue2272.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-02-18 19:39:42 +01:00
Baptiste Coudurier
a51c71bb54
In yadif filter, default to top field first if interlacing is unknown
...
Originally committed as revision 26347 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-15 00:32:36 +00:00
Baptiste Coudurier
1ef64490e1
yadif sse2/ssse3 optimizations
...
Originally committed as revision 25874 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-04 05:23:44 +00:00
Baptiste Coudurier
902d49eef7
In yadif filter, copy video props to output picture.
...
Fix issue #2269 .
Interpolate pts for the second frame when using field output mode.
Originally committed as revision 25798 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-22 20:42:08 +00:00
Aurelien Jacobs
236f79480b
merge #if with if()
...
Originally committed as revision 25233 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-27 21:48:06 +00:00
Måns Rullgård
536e229ae2
yadif: remove unnecessary #include
...
Originally committed as revision 25215 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-26 22:37:45 +00:00
Stefano Sabatini
b0f65613ac
Cosmetics: fix style nits.
...
Originally committed as revision 25207 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-26 11:09:43 +00:00
Baptiste Coudurier
48f7f29f52
In yadif filter, use current frame when previous is missing,
...
better results for the first frame
Originally committed as revision 25202 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-26 00:56:26 +00:00
Michael Niedermayer
96a1459ed5
Fix 0 vs 1 porting bug from mplayer.
...
Originally committed as revision 25197 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-25 16:54:09 +00:00
Michael Niedermayer
acbac56789
yadif filter, based on stefanos port of my yadif from mplayer.
...
Compared to stefanos, 2 frame output works with ffplay.
Originally committed as revision 25196 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-25 16:43:42 +00:00