Commit Graph

38 Commits

Author SHA1 Message Date
Michael Niedermayer
686959e87e Merge remote-tracking branch 'qatar/master'
* qatar/master:
  doxygen: Consistently use '@' instead of '\' for Doxygen markup.
  Use av_printf_format to check the usage of printf style functions
  Add av_printf_format, for marking printf style format strings and their parameters
  ARM: enable thumb for Cortex-M* CPUs
  nsvdec: Propagate error values instead of returning 0 in nsv_read_header().
  build: remove SRC_PATH_BARE variable
  build: move basic rules and variables to main Makefile
  build: move special targets to end of main Makefile
  lavdev: improve feedback in case of invalid frame rate/size
  vfwcap: prefer "framerate_q" over "fps" in vfw_read_header()
  v4l2: prefer "framerate_q" over "fps" in v4l2_set_parameters()
  fbdev: prefer "framerate_q" over "fps" in device context
  bktr: prefer "framerate" over "fps" for grab_read_header()
  ALSA: implement channel layout for playback.
  alsa: support unsigned variants of already supported signed formats.
  alsa: add support for more formats.
  ARM: allow building in Thumb2 mode

Conflicts:
	common.mak
	doc/APIchanges
	libavcodec/vdpau.h
	libavdevice/alsa-audio-common.c
	libavdevice/fbdev.c
	libavdevice/libdc1394.c
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-24 03:07:04 +02:00
Martin Storsjö
9abbe8cc13 Use av_printf_format to check the usage of printf style functions
This helps catching cases where the format string doesn't
match what is passed in, or injection bugs where user data
is passed in as format string.

Signed-off-by: Martin Storsjö <martin@martin.st>
2011-06-23 20:17:46 +03:00
Clément Bœsch
4a34e54b0e Fix zero-length gnu_printf format string warning.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-21 21:41:28 +02:00
Michael Niedermayer
2905e3ff64 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  lavc: add opt_find to AVCodecContext class.
  h264: Complexify frame num gap shortening code
  intreadwrite.h: fix AV_RL32/AV_RB32 signedness.
  Fix decoding of mpegts streams with h264 video that does *NOT* have b frames
  Add minor bumps and APIChanges entries for lavf private options.
  ffmpeg: deprecate -vc and -tvstd
  ffmpeg: use new avformat_open_* API.
  ffserver: use new avformat_open_* API.
  ffprobe: use new avformat_open_* API.
  ffplay: use new avformat_open_* API.
  cmdutils: add opt_default2().
  dict: add AV_DICT_APPEND flag.
  lavf: add avformat_write_header() as a replacement for av_write_header().
  Deprecate av_open_input_* and remove their uses.
  lavf: add avformat_open_input() as a replacement for av_open_input_*
  AVOptions: add av_opt_find() as a replacement for av_find_opt.
  AVOptions: add av_opt_set_dict() mapping a dictionary struct to a context.
  ffmpeg: don't abuse a global for passing frame size from input to output
  ffmpeg: don't abuse a global for passing pixel format from input to output
  ffmpeg: initialise encoders earlier.

Conflicts:
	cmdutils.c
	doc/APIchanges
	ffmpeg.c
	ffplay.c
	ffprobe.c
	libavcodec/h264.c
	libavformat/avformat.h
	libavformat/utils.c
	libavformat/version.h
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-18 05:10:38 +02:00
Anton Khirnov
dc59ec5e79 AVOptions: add av_opt_find() as a replacement for av_find_opt. 2011-06-16 20:24:56 +02:00
Reimar Döffinger
3b6bbfa063 Check syntax even if DEBUG is not defined. 2011-05-11 12:26:25 +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
Luca Barbato
9ef5a9deaf Replace dprintf with av_dlog
dprintf clashes with POSIX.1-2008
(cherry picked from commit dfd2a005eb)
2011-01-30 03:41:48 +01:00
Luca Barbato
dfd2a005eb Replace dprintf with av_dlog
dprintf clashes with POSIX.1-2008
2011-01-29 23:55:37 +01: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
Diego Biurrun
eee9119ad1 Add parameter names to av_log/av_vlog function declarations.
Doxygen gets confused without an explicit parameter name.

Originally committed as revision 23972 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 11:03:23 +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
Michael Niedermayer
2c1bb26535 Make it possible for a log context to keep track of its parent context.
This is usefull to keep track and display relations where things are a
bit more complex (like AVProtocols or demuxers used by demuxers and such)

Originally committed as revision 23199 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-19 22:50:39 +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
Jai Menon
707cd944d6 Fix typo.
Originally committed as revision 22988 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-28 20:08:02 +00:00
Michael Niedermayer
2308b6c19a Add version to AVClass so we can add to and use fields of AVClass without ABI issues.
Originally committed as revision 22987 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-28 20:00:23 +00:00
Stefano Sabatini
68485d2728 Remove useless definition of struct AVCLASS.
Originally committed as revision 19402 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-12 11:30:42 +00:00
Stefano Sabatini
bf7e799c9e Remove '\p', '\c' and '\e' doxygen markup from doxy, as it should
improve plain text doxy readability.

See the thread: "[RFC] Should we use doxygen markup?".

Originally committed as revision 19122 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-06 09:35:15 +00:00
Diego Biurrun
082dea8e40 Remove all remaining code that was disabled through the major version bump.
Originally committed as revision 17903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-09 10:24:47 +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
bfe3676feb spelling/grammar/consistency review part II
Originally committed as revision 16848 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-28 23:03:17 +00:00
Aurelien Jacobs
af5f434f8c add the necessary include for LIBAV*_VERSION_*
Originally committed as revision 16571 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-13 00:14:43 +00:00
Stefano Sabatini
987903826b Globally rename the header inclusion guard names.
Consistently apply this rule: the guard name is obtained from the
filename by stripping the leading "lib", converting '/' and '.'  to
'_' and uppercasing the resulting name. Guard names in the root
directory have to be prefixed by "FFMPEG_".

Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 07:39:47 +00:00
Diego Biurrun
91605c69fb minor wording fix
Originally committed as revision 13068 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-06 08:41:13 +00:00
Diego Biurrun
e4a957d1a7 minor spelling fix
Originally committed as revision 13066 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-06 08:03:30 +00:00
Stefano Sabatini
95a6a015e3 Enhance documentation for AVClass
Patch by Stefano Sabatini stefanodotsabatini-lalaatpostedotit

Originally committed as revision 12934 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-24 10:13:38 +00:00
Stefano Sabatini
07c37ca7fc remove useless extern keyword.
patch by Stefano Sabatini: stefano sabatini-lala poste it

Originally committed as revision 12790 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-11 14:18:33 +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
Diego Biurrun
5b21bdabe4 Add FFMPEG_ prefix to all multiple inclusion guards.
Originally committed as revision 10765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-17 09:37:46 +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
Luca Abeni
434f2c18e8 Increase the av_log() levels, and add some documentation for them
Originally committed as revision 7614 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 20:47:10 +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
Baptiste Coudurier
3666f75d33 make option field const
Originally committed as revision 7093 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-16 00:29:15 +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
Diego Biurrun
04d7f60143 Add official LGPL license headers to the files that were missing them.
Originally committed as revision 6219 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-10 14:02:42 +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