RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
33,304 Commits 36 Branches 398 Tags 226 MiB
Commit Graph

42 Commits

Author SHA1 Message Date
Michael Niedermayer faba79e080 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata.
  H.264: tweak some other x86 asm for Atom
  probe: Fix insane flow control.
  mpegts: remove invalid error check
  s302m: use nondeprecated audio sample format API
  lavc: use designated initialisers for all codecs.
  x86: cabac: add operand size suffixes missing from 6c32576

Conflicts:
	libavcodec/ac3enc_float.c
	libavcodec/flacenc.c
	libavcodec/frwu.c
	libavcodec/pictordec.c
	libavcodec/qtrleenc.c
	libavcodec/v210enc.c
	libavcodec/wmv2dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-07-30 06:46:08 +02:00
Anton Khirnov ec6402b7c5 lavc: use designated initialisers for all codecs. 
It's more readable and less prone to breakage.
 2011-07-29 08:42:34 +02:00
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
Diego Biurrun adbfc605f6 doxygen: Consistently use '@' instead of '\' for Doxygen markup. 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-06-24 00:37:49 +02:00
Stefano Sabatini ce5e49b0c2 replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_* 2011-05-02 16:41:41 +02:00
Stefano Sabatini 975a1447f7 Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*. 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-05-02 12:18:44 +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
Reinhard Tartler 7ffe76e540 Merge libavcore into libavutil 
Done to keep ABI compatible. Otherwise this is just silly
 2011-02-16 23:00:30 +01:00
Reinhard Tartler 737eb5976f Merge libavcore into libavutil 
It is pretty hopeless that other considerable projects will adopt
libavutil alone in other projects. Projects that need small footprint
are better off with more specialized libraries such as gnulib or rather
just copy the necessary parts that they need. With this in mind, nobody
is helped by having libavutil and libavcore split. In order to ease
maintenance inside and around FFmpeg and to reduce confusion where to
put common code, avcore's functionality is merged (back) to avutil.

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2011-02-15 16:18:21 +01:00
Diego Elio Pettenò e7e2df27f8 Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf. 
None of these symbols should be accessed directly, so declare them as
hidden.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d36beb3f69)
 2011-01-28 03:15:34 +01:00
Diego Elio Pettenò d36beb3f69 Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf. 
None of these symbols should be accessed directly, so declare them as
hidden.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-26 16:08:45 +00:00
Reimar Döffinger 4be170c937 Use av_fast_malloc instead of av_realloc. 
This should be faster, is less code and fixes issue 2524
(allocation error would lead to crash).
(cherry picked from commit e7b95918fc)
 2011-01-24 21:25:43 +01:00
Reimar Döffinger e7b95918fc Use av_fast_malloc instead of av_realloc. 
This should be faster, is less code and fixes issue 2524
(allocation error would lead to crash).
 2011-01-24 19:35:20 +01:00
Stefano Sabatini e16f217ceb Use new imgutils.h API names, fix deprecation warnings. 
Originally committed as revision 25058 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-07 19:15:29 +00:00
Stefano Sabatini 6ce9b4310c Remove use of the deprecated function avcodec_check_dimensions(), use 
av_check_image_size() instead.

Originally committed as revision 24711 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-06 09:37:04 +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
Reimar Döffinger 19a9a49e84 Simplify: reget_buffer behaves exactly like get_buffer if the buffer was 
previously released, so no extra condition is necessary.

Originally committed as revision 19808 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-10 12:23:45 +00:00
Thilo Borgmann 7a00bbad21 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an 
AVPacket argument rather than a const uint8_t *buf + int buf_size. This allows
passing of packet-specific flags from demuxer to decoder, such as the keyframe
flag, which appears necessary to playback corePNG P-frames.

Patch by Thilo Borgmann thilo.borgmann googlemail com, see also the thread
"Google Summer of Code participation" on the mailinglist.

Originally committed as revision 18351 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-07 15:59:50 +00:00
Reimar Döffinger 5133816627 Set AVFrame.reference correctly for nuv decoder. 
Originally committed as revision 17807 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-04 17:12:58 +00:00
Diego Biurrun 0ffbc258aa Change a bunch of codec long_names to be more consistent and descriptive. 
Originally committed as revision 17716 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-02 05:18:33 +00:00
Reimar Döffinger 0b178e5629 Add av_ prefix to LZO stuff and thus make it officially part of the public API. 
Keep lzo1x_decode until the next major version bump for binary compatibility.

Originally committed as revision 16946 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-02 20:16:00 +00:00
Reimar Döffinger 2881a656ff Fix nuv decoder to use reget_buffer for non-keyframes and correctly 
identify non-keyframe RTJPEG frames.

Originally committed as revision 15217 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-05 16:31:26 +00:00
Stefano Sabatini fe4bf37455 Make AVCodec long_names definition conditional depending on CONFIG_SMALL. 
Originally committed as revision 13759 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-12 21:50:13 +00:00
Diego Biurrun 245976da2a Use full path for #includes from another directory. 
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-09 11:56:36 +00:00
Stefano Sabatini d5202e4fda Add long names to many AVCodec declarations. 
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13005 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-27 10:52:44 +00:00
Zuxy Meng 98a6fff98c Apply 'cold' attribute to init/uninit functions in libavcodec 
Originally committed as revision 12525 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-21 03:11:20 +00:00
Michael Niedermayer 07311324a3 const 
Originally committed as revision 11734 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-01 13:55:15 +00:00
Michael Niedermayer 7993df6527 consts 
I have underestimated this a little, and these are just some ...

Originally committed as revision 11708 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-01 03:26:31 +00:00
Reimar Döffinger ba430e0cfa dsputil must be initialized before calling rtjpeg init. 
Originally committed as revision 10463 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-09 18:14:11 +00:00
Reimar Döffinger 1551e8e87f Properly handle nuv file with changing resolution 
Originally committed as revision 10448 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-09 10:20:47 +00:00
Reimar Döffinger fd065d0593 Make sure rtjpeg quality is a valid value 
Originally committed as revision 10444 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-09 09:16:47 +00:00
Reimar Döffinger 6cf7e81f8c Fix extreme stupidity: buffer size check must of course be before buffer use! 
Originally committed as revision 10443 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-09 09:00:12 +00:00
Reimar Döffinger 048905a484 10l, add check forgotten in last commit 
Originally committed as revision 10442 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-09 08:52:53 +00:00
Reimar Döffinger 4f8a91c961 First ugly and slow attempt to fix nuv files with extra frameheader 
and per-frame rtjpeg quality

Originally committed as revision 10441 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-09 08:42:49 +00:00
Reimar Döffinger c612b00d7e Simplify nuv: factor out LZO decompression 
Originally committed as revision 10440 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-09 08:22:07 +00:00
Diego Biurrun 2029f312e8 Remove redundant #inclusion of common.h, avcodec.h already #includes it. 
Originally committed as revision 8967 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-10 09:00:44 +00:00
Nicholas Tung e4141433ea Get rid of unnecessary pointer casts. 
patch by Nicholas Tung, ntung ntung com

Originally committed as revision 8687 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-08 20:24:16 +00:00
Nicholas Tung 587d07227e Remove superfluous setting of has_b_frames in codecs without B-frames. 
patch by Nicholas Tung, ntung ntung com

Originally committed as revision 8647 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-07 17:37:30 +00:00
Panagiotis Issaris 636d6a4a47 Add the prefix "av_" to img_crop(), img_copy() and img_pad(), and rename "img" 
to "picture" as suggested by Baptiste Coudurier.

Originally committed as revision 8220 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-04 11:53:11 +00:00
Alex Beregszaszi fead30d444 rename BE/LE_8/16/32 to AV_RL/B_8/16/32 
Originally committed as revision 7587 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-19 22:12:59 +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
Reimar Döffinger dfca23e361 NuppelVideo/MythTVVideo support, including rtjpeg decoder 
Originally committed as revision 5232 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-03-27 22:22:50 +00:00