1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Commit Graph

36 Commits

Author SHA1 Message Date
Stefano Sabatini
22180e7a5a error: remove symbols which were deprecated before the big bump
The removal was not applied when merging the Libav patches, because
there was still code referencing the symbols.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
2011-04-22 10:21:21 +02:00
Michael Niedermayer
8772156be0 Merge remote branch 'qatar/master'
* qatar/master:
  APIChanges: document git revision for CODEC_CAP_SLICE_THREADS addition.
  Introduce slice threads flag.
  FATE: allow forcing thread-type when doing threaded fate runs.
  Use av_log_ask_for_sample() where appropriate.
  error: sort, pack, and align error code and string definitions
  The stabilization period after version bumps should be one month, not one week.
  applehttp: Expose the stream bitrate via metadata
  doc: Add some initial docs on the applehttp demuxer
  Provide a fallback version of the libm function trunc
  libavdevice: Define _XOPEN_SOURCE for usleep
  lavc: provide deprecated avcodec_thread_init until next major version
  lavc: provide the opt.h header until the next bump
  error: change AVERROR_EOF value
  error: remove AVERROR_NUMEXPECTED
  error: add error code AVERROR_OPTION_NOT_FOUND, and use it in opt.c

Conflicts:
	libavcodec/h264.c
	libavutil/error.c
	libavutil/error.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-22 03:54:30 +02:00
Stefano Sabatini
8d67218bd7 error: sort, pack, and align error code and string definitions
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2011-04-21 16:48:29 +02:00
Anton Khirnov
a975dbc86b error: change AVERROR_EOF value
The current value is masking the POSIX error code EPIPE, which has a
different semantics.

This breaks API.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-04-21 07:10:16 +02:00
Stefano Sabatini
79157f400b error: remove AVERROR_NUMEXPECTED
AVERROR_NUMEXPECTED is used only in the image muxer and demuxer, and
has a too much specific meaning, which is better explained through a
log message. Thus it can be replaced by AVERROR(EINVAL).

This breaks API.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-04-21 07:10:16 +02:00
Stefano Sabatini
58f8463947 error: add error code AVERROR_OPTION_NOT_FOUND, and use it in opt.c
The new error code is better than AVERROR(ENOENT), which has a
completely different semantics ("No such file or directory").

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-04-21 07:10:16 +02:00
Michael Niedermayer
efb5fa79f5 Merge remote branch 'qatar/master'
* qatar/master: (37 commits)
  In avcodec_open(), set return code to an error value only when an error occurs instead of unconditionally at the start of the function.
  lavc: remove reference to opt.h from Makefile.
  prefer avio_check() over url_exist()
  avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbols
  lavu: remove misc disabled cruft
  lavu: remove FF_API_OLD_IMAGE_NAMES cruft
NOT PULLED  lavu: remove FF_API_OLD_EVAL_NAMES cruft
  lavc: remove misc disabled cruft.
  lavc: remove the FF_API_INOFFICIAL cruft.
  lavc: remove the FF_API_SET_STRING_OLD cruft.
  lavc: remove the FF_API_USE_LPC cruft.
  lavc: remove the FF_API_SUBTITLE_OLD cruft.
  lavc: remove the FF_API_VIDEO_OLD cruft.
  lavc: remove the FF_API_AUDIO_OLD cruft.
  lavc: remove the FF_API_OPT_SHOW cruft.
  lavc: remove the FF_API_MM_FLAGS cruft.
  lavf: remove misc disabled cruft.
  lavf: remove FF_API_INDEX_BUILT cruft
  lavf: remove FF_API_URL_CLASS cruft.
  lavf: remove FF_API_SYMVER cruft
  ...

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-20 04:48:23 +02:00
Anton Khirnov
490a022d86 lavu: remove misc disabled cruft 2011-04-19 19:04:28 +02:00
Michael Niedermayer
2d2b5a1421 10l, commit that should have been stashed into the merge.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-17 23:59:00 +02:00
Michael Niedermayer
c40798441f Merge remote branch 'qatar/master'
* qatar/master:
  ac3dec: fix processing of delta bit allocation information.
  vc1: fix fate-vc1 after previous commit.
  wmv3dec: fix playback of complex WMV3 files using simple_idct.
  make av_dup_packet() more cautious on allocation failures
  make containers pass palette change in AVPacket
  introduce side information for AVPacket

Politic commits that have not been pulled:
  Update regtest checksums after revision 6001dad.
  Replace more FFmpeg references by Libav.
  Replace references to ffmpeg-devel with libav-devel; fix roundup URL.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-17 23:43:54 +02:00
Diego Biurrun
6001dad6e2 Replace more FFmpeg references by Libav. 2011-04-17 19:31:49 +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
Nicolas George
bafa4dd3e6 Add AVERROR_EXIT.
This is different from AVERROR(EINTR) because calls that fail with EINTR
should usually be restarted.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-15 08:09:19 -04:00
Nicolas George
0bc55f5d32 Add AVERROR_*_NOT_FOUND codes.
Originally committed as revision 26056 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-19 09:01:02 +00:00
Måns Rullgård
2eaf7e49c7 Improve av_strerror() documentation
Originally committed as revision 23910 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-30 20:09:52 +00:00
Måns Rullgård
49bd8e4b84 Fix grammar errors in documentation
Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-30 15:38:06 +00:00
Stefano Sabatini
e2959f4558 Make av_strerror() return -1 even in the case when av_strerror_r() is
not defined.

This allows applications to check if av_strerror() cannot provide a
meaningful representation for the provided error code, without having
to actually check the filled string.

Originally committed as revision 23031 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-05 21:44:47 +00:00
Stefano Sabatini
441ea0ce91 Make av_strerror() print an error message mentioning the error code
number if strerror_r() did not succeed for whatever reason.

This avoids the need for the application to fill the string in case
strerror_r() fails, for example because the error code is not known.

Originally committed as revision 23015 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-03 21:56:21 +00:00
Stefano Sabatini
cf103fabbe Drop AVERROR_NOTSUPP at the next major bump, use AVERROR(ENOSYS)
instead which is semantically equivalent.

See the thread:
Subject: [FFmpeg-devel] [RFC] The meaning of AVERROR_NOTSUPP
Date: Sat, 27 Mar 2010 00:51:13 +0100

Originally committed as revision 22981 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-27 22:26:08 +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
87958234f9 Implement av_strerror().
Originally committed as revision 22684 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-25 22:46:35 +00:00
Stefano Sabatini
0394c928db Prefer '///< ...' doxygen inline syntax over '/**< ... */'.
Originally committed as revision 22683 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-25 22:46:32 +00:00
Stefano Sabatini
b748b9d69b Use consistent punctuation rules for the error message descriptions.
Originally committed as revision 22682 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-25 22:46:28 +00:00
Stefano Sabatini
68006ed062 Drop AVERROR_NOFMT at the next libavutil major bump.
Originally committed as revision 22626 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-21 16:34:06 +00:00
Stefano Sabatini
72af5d8a02 Change the definition of AVERROR_INVALIDDATA at the next libavutil
major bump, using an FFmpeg specific error code rather than EINVAL,
which has a quite different semantics.

Originally committed as revision 22601 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-19 23:34:36 +00:00
Stefano Sabatini
0029156589 Extend description for AVERROR_INVALIDDATA.
Originally committed as revision 22600 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-19 23:34:34 +00:00
Måns Rullgård
6d2877f47e error.h: test EDOM instead of EINVAL
C99 doesn't require EINVAL, only EDOM, EILSEQ, and ERANGE.

Originally committed as revision 22530 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-14 22:25:35 +00:00
Måns Rullgård
e4836e3c07 Add missing includes to libavutil/error.h
Originally committed as revision 22529 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-14 22:25:31 +00:00
Stefano Sabatini
73ddbd9d0e Change the definition of AVERROR_NUMEXPECTED at the next libavutil
major bump, using an FFmpeg specific error code rather than EDOM,
which has a quite different semantics.

Originally committed as revision 22528 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-14 21:16:29 +00:00
Stefano Sabatini
c6a7b97c8e Mark AVERROR_ENOENT for deletion at the next libavutil major bump.
The symbol is currently unused, AVERROR(ENOENT) must be used instead.

Originally committed as revision 22519 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-14 01:32:44 +00:00
Stefano Sabatini
9b359f517e Lexically sort the error code definitions.
Originally committed as revision 22518 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-14 01:32:41 +00:00
Stefano Sabatini
7c074320ba Mark AVERROR_ENOMEM to be deleted at the next major bump.
AVERROR(ENOMEM) must be used instead, and there are no occurrences of
AVERROR_ENOMEM in the FFmpeg basecode so it can be safely dropped.

Originally committed as revision 22514 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-13 19:19:46 +00:00
Stefano Sabatini
5ae092ee34 Replace all the occurrences of AVERROR_EIO with AVERROR(EIO), and mark
AVERROR_EIO for deletion at the next major bump.

Originally committed as revision 22513 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-13 19:19:44 +00:00
Stefano Sabatini
0edfa79b23 Make iff.c:decode_init return the value returned by
avctx->get_buffer() in case of error, rather than AVERROR_UNKNOWN
which is deprecated, and mark AVERROR_UNKNOWN for deletion at the next
major bump.

Originally committed as revision 22512 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-13 19:19:40 +00:00
Stefano Sabatini
dbfa5e7861 Add missing parentheses around the AVERROR_PATCHWELCOME macro
definition.

Originally committed as revision 22502 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-13 09:52:43 +00:00
Stefano Sabatini
60c144f700 Move error code definitions from libavcodec/avcodec.h to
libavutil/error.h.

Error code definitions and handling code belong to libavutil, where
they can be shared by all the libav* libraries.

See the thread:
Subject: [FFmpeg-devel] [PATCH] Move error codes definitions from lavc to lavu
Date: Sun, 19 Jul 2009 12:09:16 +0200

Originally committed as revision 22501 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-13 09:43:24 +00:00