Commit Graph

81 Commits

Author SHA1 Message Date
Michael Niedermayer 455ce979d0 Merge remote branch 'qatar/master'
* qatar/master:
LOTS of duplicates ...
  avio: Fix the deprecated fallback URL-prefixed open flags
  avoid duplicate -lm in .pc files
  mpeg12: terminate mpeg2_video_profiles arrays
  network: Check POLLERR and POLLHUP in ff_network_wait_fd
  mpegtsenc: make PMT PID really start on pmt_start_pid
  nut format: support PIX_FMT_BGR48LE and PIX_FMT_BGR48BE
  rawvideo codec: support PIX_FMT_BGR48LE and PIX_FMT_BGR48BE
  hflip: make the filter accept PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats
  crop: make the filter accept PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats
  libswcale: PIX_FMT_BGR48LE and PIX_FMT_BGR48BE scaler implementation

Conflicts:
	configure
	libswscale/swscale.h
	tests/ref/lavf/ts

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-29 04:29:21 +02:00
Peter Ross 1afbae100b libswcale: PIX_FMT_BGR48LE and PIX_FMT_BGR48BE scaler implementation
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-04-28 07:25:27 +02:00
Anton Khirnov 7dfe244fbd sws: remove disabled cruft. 2011-04-19 21:50:12 +02:00
Anton Khirnov 139f3ac42d Bump major versions of all libraries.
They've accumulated enough new APIs and corresponding deprecated cruft.

This breaks API and ABI.
2011-04-18 20:19:47 +02:00
Michael Niedermayer c0e51ec9c6 Merge remote branch 'qatar/master'
* qatar/master:
  Fix parser: mark av_parser_parse() for removal on next major bump
  swscale: postpone sws_getContext removal until next major bump.
  fate: add AAC LATM test
  mmst: get rid of deprecated AVERRORs
  lxfdec: use AVERROR(ENOMEM) instead of deprecated AVERROR_NOMEM.
  Reemove remaining uses of deprecated AVERROR_NOTSUPP.
REIMPLEMENTED in 2 lines of code:  lavf: if id3v2 tag is present and all else fails, guess by file extension

Conflicts:
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-07 03:32:26 +02:00
Anton Khirnov 0464ee9af2 swscale: postpone sws_getContext removal until next major bump.
The replacement isn't ready yet.
2011-04-06 22:55:28 +02:00
Peter Ross 3e2523db20 libswcale: PIX_FMT_BGR48LE and PIX_FMT_BGR48BE scaler implementation 2011-03-26 13:24:32 +11: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
Stefano Sabatini 0810a5846b Deprecate sws_getContext(), use sws_alloc_context() and
sws_init_context() instead.

Originally committed as revision 32401 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-09-28 22:23:58 +00:00
Stefano Sabatini 499287e0a5 Add documentation for the returned value of sws_init_context().
Originally committed as revision 32400 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-09-28 22:23:53 +00:00
Stefano Sabatini c508ab6736 Bump minor version after the addition of sws_alloc_context() and
sws_init_context() of r32368.

Originally committed as revision 32396 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-09-28 15:29:23 +00:00
Ramiro Polla 33ce384688 fix typos and grammar
Originally committed as revision 32370 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-09-26 20:31:04 +00:00
Michael Niedermayer 635d4aed60 Split alloc and init of context so that parameters can be set in the context
instead of requireing being passed through function parameters. This also
makes sws work with AVOptions.

Originally committed as revision 32368 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-09-26 19:33:57 +00:00
Ramiro Polla 539ff40c2d rgb2rgb: build SSE2 codepath
Originally committed as revision 32068 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-09-08 13:16:15 +00:00
Stefano Sabatini ed80ba7461 Revert commit:
r31772 | stefano | 2010-07-23 01:01:31 +0200 (Fri, 23 Jul 2010) | 2 lines

  Prefer impersonal form over third person, for consistency with the
  rest of FFmpeg.

The change was not approved by the maintainer.

Originally committed as revision 31847 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-07-28 10:43:02 +00:00
Stefano Sabatini 5b9eb68749 Prefer impersonal form over third person, for consistency with the
rest of FFmpeg.

Originally committed as revision 31772 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-07-22 23:01:31 +00:00
Reinhard Tartler 2b991422f8 deprecate palette8topacked32 in favor of public API functions sws_convertPalette8ToPacked32 and -24
additionallym deprecate palette8torgb16 and its bgr variant without
replacement. These functions are not meant to be used by applications.

Discussed at: http://comments.gmane.org/gmane.comp.video.ffmpeg.devel/109340

Originally committed as revision 31301 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-06-01 19:35:16 +00:00
Stefano Sabatini d458b7d445 Add empty newline to separate function declarations, for better
readability.

Originally committed as revision 31192 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-05-23 10:02:30 +00:00
Diego Biurrun 353285d740 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 31050 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-04-20 14:47:31 +00:00
Stefano Sabatini fbc0f6a973 Apply misc fixes to sws_getCoefficients() doxy.
Originally committed as revision 30519 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-02-05 22:56:59 +00:00
Stefano Sabatini 89ee5c6897 Satisfy consistency need:
int * sws_getCoefficients  -> int *sws_getCoefficients.

Originally committed as revision 30518 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-02-05 22:54:45 +00:00
David Conrad 3f3dc76cb1 Add function to translate SWS_CS_* to coefficient array
Originally committed as revision 30513 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-02-05 16:09:03 +00:00
David Conrad 01cc47dcd3 More const-correctness for sws_scale
Originally committed as revision 30381 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-21 09:52:11 +00:00
Alexis Ballier f28cc5771f Make const prototypes for input sources of sws_scale_* stricter.
Patch by Alexis Ballier gmailify($firstname, $familyname)

Originally committed as revision 30374 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-19 16:30:20 +00:00
Zuxy Meng a959e24780 Const correctness for src pointer. Remove all constness related warnings in
libswscale.

Originally committed as revision 30306 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-15 08:51:51 +00:00
Stefano Sabatini 8e9767f6fd Implement sws_isSupportedInput() and sws_isSupportedOutput().
Originally committed as revision 30236 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-07 19:07:47 +00:00
Stefano Sabatini 997980f0d8 Prefer "*FUNC_NAME(" over "* FUNC_NAME(" for the
swscale_configuration() and swscale_license() functions, consistent
with the rest of FFmpeg.

Originally committed as revision 30180 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-03 14:35:20 +00:00
Stefano Sabatini a9af75ae85 Make sws_format_name() use av_pix_fmt_descriptors.
This also introduces a dependency of libswscale on libavutil.

Originally committed as revision 29968 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-11-26 21:08:45 +00:00
Diego Biurrun bd381fd3f6 Add functions to return library license and library configuration.
Originally committed as revision 29932 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-11-18 17:16:02 +00:00
Stefano Sabatini 2e0a80a128 Document sws_freeContext().
Originally committed as revision 29844 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-11-07 09:23:11 +00:00
Stefano Sabatini a520e9f235 Document slice ordering assumption done by sws_scale().
Originally committed as revision 29804 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-10-30 14:13:25 +00:00
Ramiro Polla 30715d4273 Document that slices can be bottom to top or top to bottom.
Originally committed as revision 29665 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-09-09 21:43:25 +00:00
Ramiro Polla 1aff375d41 Introduce and use sws_allocVec().
Originally committed as revision 29536 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-08-19 01:33:17 +00:00
Stefano Sabatini 532ec28360 Remove '\p' doxygen markup, as it should improve plain text doxy
readability.

Originally committed as revision 29351 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-06-06 09:37:46 +00:00
Diego Biurrun 0020c54cb8 Add const qualifier to param argument of sws_getContext() and
sws_getCachedContext().  Fixes the warning:
swscale.c:3408: warning: assignment discards qualifiers from pointer target type

Originally committed as revision 29288 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-05-10 14:00:00 +00:00
Stefano Sabatini 2d26fa2822 Move sws_[gs]etColorspaceDetails() documentation from swscale.c to
swscale.h.

Originally committed as revision 29186 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-04-18 11:45:31 +00:00
Diego Biurrun d648c720af whitespace cosmetics: Break some overly long lines.
Originally committed as revision 29180 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-04-14 14:39:04 +00:00
Kostya Shishkov e76709d8a6 New LGPLed YUV2RGB table generator for SwScaler
Originally committed as revision 28700 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-02-22 09:22:05 +00:00
Stefano Sabatini 15239b7fcc Rename the "src" parameter in the sws_scale() declaration to
"srcSlice" to stress the fact that it references a slice rather than an
image.

Originally committed as revision 28655 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-02-18 23:16:31 +00:00
Stefano Sabatini 583799c459 Document sws_scale().
Originally committed as revision 28654 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-02-18 23:11:47 +00:00
Stefano Sabatini 26b40a659d Implement sws_printVec2() and deprecate sws_printVec().
Originally committed as revision 28566 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-02-14 20:14:28 +00:00
Stefano Sabatini a26b51cd4a Document sws_normalizeVec().
Originally committed as revision 28565 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-02-14 19:37:13 +00:00
Stefano Sabatini 39e80e6cb9 Apply misc fixes for sws_getCachedContext() documentation.
Originally committed as revision 28537 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-02-12 00:12:10 +00:00
Stefano Sabatini 70bf0416cf Bump micro version, related to r28491.
See the thread:
"[FFmpeg-devel] [PATCH] Explicitely declare {dst, src}Format sws_get*Context() params as enum PixelFormat".

Originally committed as revision 28536 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-02-12 00:07:44 +00:00
Stefano Sabatini a15886540b Document sws_getContext().
Originally committed as revision 28535 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-02-11 23:42:29 +00:00
Stefano Sabatini b5fdaebb44 Document sws_getIdentityVec().
Originally committed as revision 28533 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-02-11 21:34:44 +00:00
Stefano Sabatini 6d3cf67c2a Move sws_getGaussianVec() documentation from swscale.c to swscale.h.
Originally committed as revision 28528 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-02-10 23:45:50 +00:00
Stefano Sabatini 89b7464732 Document sws_cloneVec().
Originally committed as revision 28527 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-02-10 23:43:08 +00:00
Stefano Sabatini 70838eefbf Fix typo: lenght -> length.
Originally committed as revision 28526 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-02-10 23:40:58 +00:00
Stefano Sabatini 0bcb5b3918 Document sws_scaleVec().
Originally committed as revision 28525 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-02-10 23:38:01 +00:00