Commit Graph

22 Commits

Author SHA1 Message Date
Michael Niedermayer 976a8b2179 Merge remote-tracking branch 'qatar/master'
* qatar/master: (40 commits)
  H.264: template left MB handling
  H.264: faster fill_decode_caches
  H.264: faster write_back_*
  H.264: faster fill_filter_caches
  H.264: make filter_mb_fast support the case of unavailable top mb
  Do not include log.h in avutil.h
  Do not include pixfmt.h in avutil.h
  Do not include rational.h in avutil.h
  Do not include mathematics.h in avutil.h
  Do not include intfloat_readwrite.h in avutil.h
  Remove return statements following infinite loops without break
  RTSP: Doxygen comment cleanup
  doxygen: Escape '\' in Doxygen documentation.
  md5: cosmetics
  md5: use AV_WL32 to write result
  md5: add fate test
  md5: include correct headers
  md5: fix test program
  doxygen: Drop array size declarations from Doxygen parameter names.
  doxygen: Fix parameter names to match the function prototypes.
  ...

Conflicts:
	libavcodec/x86/dsputil_mmx.c
	libavformat/flvenc.c
	libavformat/oggenc.c
	libavformat/wtv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-04 00:45:21 +02:00
Mans Rullgard 0ebcdf5cda Do not include mathematics.h in avutil.h
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-03 21:42:06 +01:00
Stefano Sabatini 35fe66abbc lavfi: rename AVFilterBufferRefVideoProps.pixel_aspect to sample_aspect_ratio
Improve consistency with libavcodec.

This breaks libavfilter API/ABI.

The non-sequential 2.1.0 -> 2.4.0 bump is due to the mess previously
done with the lavfi minor number.
2011-05-01 13:10:18 +02:00
Stefano Sabatini c61bfc113a setdar: prefer "sar" over "par" in log info message
This is more consistent with the terminology adopted by the aspect
filter names.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-04-25 22:45:44 +02:00
Stefano Sabatini 3ea031b3f2 setdar: prefer "sar" over "par" in log info message
This is more consistent with the terminology adopted by the aspect
filter names.
2011-03-27 16:27:05 +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
Michael Niedermayer 910b5b82e8 Add sample_aspect_ratio to AVFilterLink
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-14 13:07:21 +00:00
Michael Niedermayer 14b171cd71 Add sample_aspect_ratio to AVFilterLink 2011-01-31 21:32:06 +01:00
Baptiste Coudurier 6fd2b8bd0a In aspect filter, fix display for input resolution
Originally committed as revision 25819 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-24 02:38:55 +00:00
Stefano Sabatini b7be04f3c0 Reindent.
Originally committed as revision 25803 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-22 22:03:32 +00:00
Stefano Sabatini 7de19a3264 Implement robust parsing in aspect filters.
Originally committed as revision 25802 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-22 22:03:30 +00:00
Stefano Sabatini eee0ef5e4f Add informative log messages to the set aspect filters.
Originally committed as revision 25801 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-22 22:03:27 +00:00
Stefano Sabatini 2fb21bf4ff Give more explicit/less confusing names to the filters dealing with
aspect ratio.

Originally committed as revision 25800 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-22 22:03:24 +00:00
Stefano Sabatini 9abf34411a Log error message in case of invalid parsing.
Originally committed as revision 25765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-18 20:37:22 +00:00
Stefano Sabatini bdb47f3a2c Fix style: if( -> if (.
Originally committed as revision 25764 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-18 20:37:20 +00:00
Stefano Sabatini cef4b74bf2 Remove redundant information in header.
Originally committed as revision 25763 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-18 20:37:17 +00:00
S.N. Hemanth Meenakshisundaram cc80caff52 Separate video specific BufferRef properties into VideoProps.
Define a new struct AVFilterBufferRefVideoProps and add a type field
to AVFilterBufferRef.

Video specific properties in AVFilterBufferRefVideoProps are now
referred to by *video pointer in AVFilterBufferRef.

Patch by S.N. Hemanth Meenakshisundaram smeenaks->ucsd.edu.

Originally committed as revision 24763 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-11 11:06:04 +00:00
S.N. Hemanth Meenakshisundaram ecc8dada37 Rename AVFilterPicRef to AVFilterBufferRef.
The struct is going to be used for storing audio buffer references as
well, and the new name is more generic.

Patch by S.N. Hemanth Meenakshisundaram @smeenaks@ucsd@edu@.

Originally committed as revision 24730 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-07 01:15:19 +00:00
Diego Biurrun ba87f0801d Remove explicit filename from Doxygen @file commands.
Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.

Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-20 14:45:34 +00:00
Stefano Sabatini 72415b2adb Define AVMediaType enum, and use it instead of enum CodecType, which
is deprecated and will be dropped at the next major bump.

Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-30 23:30:55 +00:00
Bobby Bingham d313e17ab1 Use the new null callbacks to simplify filters and reduce duplicated code.
Originally committed as revision 22595 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-18 23:13:02 +00:00
Bobby Bingham 3922deb577 Add video filter to manipulate aspect ratio
Originally committed as revision 22573 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-17 03:43:14 +00:00