generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
29,746 Commits 24 Branches 241 Tags 173 MiB
67d441499a
Commit Graph

26 Commits

Author SHA1 Message Date
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