Commit Graph

50 Commits

Author SHA1 Message Date
Michael Niedermayer 6841c8c579 Merge remote branch 'qatar/master'
* qatar/master:
  log: Fix an oob array read.
  cosmetics: trim trailing whitespace in postproc
  Ban strncpy() it's too easy to misuse.
  psymodel: Remove wrapper functions.
  aacenc: Replace loop counters in aac_encode_frame() with more descriptive 'ch' and 'w'.
  regtest: remove redundant flags in jpg test
  regtest: use run_ffmpeg in do_image_formats
  regtest: simplify encoding functions
  ffmpeg.c: check for interlaced flag in the correct place.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-09 04:50:56 +02:00
Alex Converse 847aaec682 log: Fix an oob array read. 2011-05-08 13:34:05 -07:00
Alex Converse 1a5e4fd8c5 Replace strncpy() with av_strlcpy(). 2011-05-03 21:20:13 -07:00
Reinhard Tartler 0247bdee25 Fix races in default av_log handler
Prevent competing threads from overwriting (shared) buffers.

Original patch by: Michael Niedermayer <michaelni@gmx.at>
2011-04-29 22:46:13 +02:00
Michael Niedermayer 10d2ae8cf7 Merge remote branch 'qatar/master'
* qatar/master:
  Makefile: Include dependencies for test tools, too
  Remove a version check in av_log made unnecessary by the big bump.
  update last major version increase dates in APIchanges
  Reduce picture size for yadif.
  oggdec: use av_freep() instead of av_free()
  avio: Fix sanity checks in ffurl_read*
  libavformat: Free AVFormatContext->streams
  libavformat: Make protocols pass URLContext as log context where available
  asf: remove commented out code in asf_read_seek
not pulled:  libpostproc: Remove crufty code disabled by the big bump.
  Reflect 0.7_beta1 release in the Changelog
not pulled:  sws: remove disabled cruft.
  lavu: remove disabled ff_random_get_seed cruft.
  lavu: remove disabled sha1 cruft.

Conflicts:
	Changelog
	libavutil/sha1.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-21 03:37:05 +02:00
Diego Biurrun 63de9e7d80 Remove a version check in av_log made unnecessary by the big bump. 2011-04-20 18:19:04 +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 48ee302e0f Fix apparently exploitable race condition.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-25 02:24:32 +01:00
Michael Niedermayer 0a51362b3f log:Sanitize string of most control chars before printing.
This may be security relevant depending upon the used terminal.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-25 01:16:22 +01: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
Daniel Verkamp dfaa9f3cb3 Recognize FFMPEG_FORCE_NOCOLOR environment variable on Win32
Fixes issue 2461

Originally committed as revision 26186 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-01 20:08:15 +00:00
Stefano Sabatini 3011ecdeb7 Introduce FFMPEG_FORCE_NOCOLOR, with the same meaning and use of
NO_COLOR (but properly prefixed for avoiding namespace conflicts).

Originally committed as revision 25899 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-06 21:47:10 +00:00
Etienne Buira 129983408d Allow to force colored output.
Patch by Etienne Buira, etienne d buira d lists a free d fr

Originally committed as revision 25888 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-05 13:56:49 +00:00
Michael Niedermayer d7cd001ff2 indent
Originally committed as revision 25178 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-24 16:18:40 +00:00
Michael Niedermayer 8a19053361 Cosmetic (rename detect_repeats to is_atty which matches the truth)
Originally committed as revision 25177 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-24 16:18:10 +00:00
Michael Niedermayer 1c1c80f0a3 2nd try to fix av_log() repeated detection
Originally committed as revision 25174 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-24 15:37:01 +00:00
Michael Niedermayer c157fe6356 Limit av_log repeat detection to terminals so as to avoid filling files with
lots of mess.

Originally committed as revision 25117 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-14 00:17:58 +00:00
Michael Niedermayer fd3064b65e Make sure "Last message repeated" is printed.
Originally committed as revision 24573 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-28 12:08:26 +00:00
Jai Menon 50061b6234 Print a space after the AVClass prefix.
This improves readability a bit.

Originally committed as revision 23767 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-25 04:36:17 +00:00
Martin Storsjö 3c467bacaa Fix compilation on windows CE
Originally committed as revision 23600 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-14 08:51:46 +00:00
Ramiro Polla db16e3ca65 log.c: Use parameter passed to macro instead of the equivalent local variable
in the only function that uses the macro.

Originally committed as revision 23555 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-09 18:30:50 +00:00
Ramiro Polla 4855f8679e Add win32 console color output.
Based on patches by James Darnley <james dot darnley at gmail dot com>.

Originally committed as revision 23554 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-09 18:13:01 +00:00
Ramiro Polla 6e34a5582d Move ansi color array to outside of av_log_default_callback(). Do not pass
ansi color code to colored_fputs(), and pass instead the error level so the
proper color code may be used.

Originally committed as revision 23553 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-09 18:10:35 +00:00
Ramiro Polla a1c027e9e4 Rename use_ansi_color to use_color so it is not ANSI-specific.
Originally committed as revision 23552 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-09 18:07:44 +00:00
Michael Niedermayer 4880cfd952 Print parent log context too, if available.
Originally committed as revision 23200 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-19 22:51:38 +00:00
Michael Niedermayer 8d2a5139da av_default_item_name() so Simply AVClasses need 1 function less.
Originally committed as revision 23198 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-19 22:45:04 +00:00
Michael Niedermayer 3fe1ec39c6 Add means to adjust the log level per context.
Originally committed as revision 23059 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-08 20:41:20 +00:00
Michael Niedermayer 6204402409 4th try at getting ansi colors working with a default of color=yes_please.
Colors will only be used if the TERM env var is set and NO_COLOR is not set.

Originally committed as revision 22957 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-23 21:27:26 +00:00
Michael Niedermayer aebfb45774 Trying _WIN32 for win32 detection.
Originally committed as revision 22953 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-23 13:15:11 +00:00
Michael Niedermayer 7328cdfa58 Merge the 2 ANSI ESC codes.
Originally committed as revision 22952 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-23 08:11:53 +00:00
Michael Niedermayer 841073ce5e Reenable ANSI colors, use method from VLC as suggested by ramiro.
Please tell us asap if this breaks for your platform & terminal.

Originally committed as revision 22951 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-23 07:33:02 +00:00
Michael Niedermayer 2c4b87ea0e Disable ANSI color code until we figured out how to detect ANSI support in
the used terminal.

Originally committed as revision 22948 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-22 20:39:34 +00:00
Michael Niedermayer 51e026d115 Coloring the log with ANSI.
Ive checked this on black and white background and found no problem in terms
of readability.
flames welcome.

Originally committed as revision 22946 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-22 18:58:39 +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
Ramiro Polla e244f54e78 Make av_log_level static at next lavu major version bump.
Originally committed as revision 20721 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-03 18:15:54 +00:00
Michael Niedermayer b9c353fff2 Compact repeated messages to "Last message repeated x times".
Originally committed as revision 17531 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-22 17:53:14 +00:00
Diego Biurrun bad5537e2c Use full internal pathname in doxygen @file directives.
Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.

Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-01 02:00:19 +00:00
Diego Biurrun 7d685b486b spelling/grammar/consistency review part III
Originally committed as revision 16849 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-28 23:16:49 +00:00
Diego Biurrun 77652a6aaf C files should #include the header files of the same name.
Originally committed as revision 16792 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-25 22:40:43 +00:00
Benoit Fouet c3b9f5fbce Remove a useless directive.
Originally committed as revision 14645 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-06 12:04:35 +00:00
Benoit Fouet 2daefd2c00 Cosmetics: indentation
Originally committed as revision 14644 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-06 12:03:51 +00:00
Alexander Strange b1e12f99a2 Print the address of the AVCodecContext in av_log().
This makes debug output much easier to read when the
same codec is open more than once.

Originally committed as revision 14237 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-15 17:17:35 +00:00
Måns Rullgård a309073bf4 use av_log_get/set_level()
Originally committed as revision 11209 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-12 21:48:50 +00:00
Panagiotis Issaris 3ec9a7873f Move the unaltered Doxygen docs from the log source code to the accompanying
header file.

Originally committed as revision 8225 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-04 23:04:49 +00:00
Panagiotis Issaris 0f482cfcb2 Adds Doxygen docs for the av_log function.
Originally committed as revision 8040 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-20 12:41:47 +00:00
Axel Holzinger 411983c1f2 Allow to uninstall a custom log callback
patch by Axel Holzinger % aholzinger A gmx P de %
original thread:
date: Jan 11, 2007 4:54 PM
subject: [Ffmpeg-devel] [PATCH] uninstall custom log callback

Originally committed as revision 7446 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-13 17:10:34 +00:00
Diego Biurrun b78e7197a8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
and fix GPL/LGPL version mismatches.

Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-07 15:30:46 +00:00
Michael Niedermayer 918a45917c removing redundant mess next time we break compatiility
Originally committed as revision 5804 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-20 11:55:08 +00:00
Luca Abeni 4b45de0e87 Move av_log() & friends to libavutil
Originally committed as revision 5781 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-18 11:00:55 +00:00