generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
31,123 Commits 24 Branches 241 Tags 173 MiB
34ab23f226
Commit Graph

58 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
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
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
Michael Niedermayer
0fecf2642b Merge remote-tracking branch 'newdev/master' 
Conflicts:
	Changelog
	doc/APIchanges
	doc/optimization.txt
	libavformat/avio.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-17 17:22:52 +01:00
Anton Khirnov
45a8a02a41 lavf: replace avio_seek(SEEK_CUR) with avio_skip where it makes sense 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-16 22:24:51 -04:00
Anton Khirnov
66e5b1df36 avio: deprecate url_feof 
AVIOContext.eof_reached should be used directly instead.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-07 17:20:31 -05:00
Anton Khirnov
384c9c2fa7 avio: add avio_tell macro as a replacement for url_ftell 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit a2704c9712)
 2011-03-05 02:29:31 +01:00
Anton Khirnov
a2704c9712 avio: add avio_tell macro as a replacement for url_ftell 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-04 11:26:57 -05:00
Anton Khirnov
74b3f67c9c lavf: replace all uses of url_fskip with avio_seek 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e356fc57a2)
 2011-03-03 14:15:08 +01:00
Anton Khirnov
f59d8ff8cd avio: avio_ prefix for url_fseek 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 6b4aa5dac8)
 2011-03-03 14:15:03 +01:00
Anton Khirnov
e356fc57a2 lavf: replace all uses of url_fskip with avio_seek 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-01 12:22:16 -05:00
Anton Khirnov
6b4aa5dac8 avio: avio_ prefix for url_fseek 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-01 12:12:33 -05:00
Anton Khirnov
e63a362857 avio: avio_ prefixes for get_* functions 
In the name of consistency:
get_byte           -> avio_r8
get_<type>         -> avio_r<type>
get_buffer         -> avio_read

get_partial_buffer will be made private later

get_strz is left out becase I want to change it later to return
something useful.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit b7effd4e83)
 2011-02-22 02:44:37 +01:00
Anton Khirnov
b7effd4e83 avio: avio_ prefixes for get_* functions 
In the name of consistency:
get_byte           -> avio_r8
get_<type>         -> avio_r<type>
get_buffer         -> avio_read

get_partial_buffer will be made private later

get_strz is left out becase I want to change it later to return
something useful.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-21 11:23:22 -05:00
Anton Khirnov
471fe57e1a avio: rename ByteIOContext to AVIOContext. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit ae628ec1fd)
 2011-02-20 19:05:47 +01:00
Anton Khirnov
ae628ec1fd avio: rename ByteIOContext to AVIOContext. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-20 08:37:15 -05:00
Diego Elio Pettenò
66355be3c3 Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice. 
This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts.
(cherry picked from commit c6610a216e)
 2011-01-28 03:15:34 +01:00
Diego Elio Pettenò
c6610a216e Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice. 
This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts.
 2011-01-26 22:10:09 +00:00
Peter Ross
141de5a9c1 add ff_find_stream_index 
Originally committed as revision 26092 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-26 01:24:51 +00:00
Reimar Döffinger
b5bc742402 Check url_fseek results in gxf demuxer. 
Originally committed as revision 24179 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-10 23:42:08 +00:00
Diego Biurrun
e2d17d0197 Fix doxy of flags parameter in fps_umf2avr(). 
Originally committed as revision 23992 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-02 12:50:19 +00:00
Diego Biurrun
9a58234fea Fix misspelled parameter names in Doxygen documentation. 
This fixes one Doxygen warning each.

Originally committed as revision 23970 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-02 10:49:29 +00:00
Reimar Döffinger
48b5a2fa98 Support AVFMT_FLAG_IGNIDX in gxf demuxer. 
Originally committed as revision 23502 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-06 10:51:06 +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
5189573c6d Set GXF fallback time-base to match the one specified for audio-only. 
Originally committed as revision 22257 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-06 22:25:53 +00:00
Reimar Döffinger
192c14fa55 GXF time base is always based on "fields" per second even for 
non-interlaced video.
Should fix issue 1766.

Originally committed as revision 22256 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-06 22:20:33 +00:00
Diego Biurrun
406792e7b0 cosmetics: Remove pointless period after copyright statement non-sentences. 
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-19 15:46:40 +00:00
Reimar Döffinger
d77ac324fe Avoid _t in gxf enum type names 
Originally committed as revision 16112 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-13 21:58:17 +00:00
Reimar Döffinger
4e5b854e4c Use "struct gxf_stream_info" instead of "st_info_t", 
avoids a typedef that is not really worth it and the
reserved POSIX _t namespace.

Originally committed as revision 16054 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-11 10:42:06 +00:00
Baptiste Coudurier
fe28178303 cosmetics, remove GXF: in log messages since it is present in context 
Originally committed as revision 15409 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-24 23:40:55 +00:00
Baptiste Coudurier
99f296b304 skip invalid audio samples in gxf packets 
Originally committed as revision 15408 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-24 23:31:04 +00:00
Luca Abeni
dd1c8f3e6e Bump Major version, this commit is almost just renaming bits_per_sample to 
bits_per_coded_sample but that cannot be done seperately.
Patch by Luca Abeni
Also reset the minor version and fix the forgotton change to libfaad.
Note: The API/ABI should not be considered stable yet, there still may
be a change done here or there if some developer has some cleanup ideas and
patches!

Originally committed as revision 15262 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-08 14:24:59 +00:00
Stefano Sabatini
bde15e74de Make long_names in lavf/lavdev optional depending on CONFIG_SMALL. 
patch by Stefano Sabatini, stefano.sabatini-lala poste.it
along with some spelling/consistency fixes for the long names by me

Originally committed as revision 13649 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-03 16:20:54 +00:00
Reimar Döffinger
6c10281c3a Check for av_new_stream failure, fixes CID76 RUN2 
Originally committed as revision 13533 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-29 15:22:45 +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
Björn Axelsson
899681cd1d Use dynamically allocated ByteIOContext in AVFormatContext 
patch by: Björn Axelsson, bjorn d axelsson a intinor d se
thread: [PATCH] Remove static ByteIOContexts, 06 nov 2007

Originally committed as revision 11071 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-21 07:41:00 +00:00
Diego Biurrun
a889bf135e cosmetics: typo 
Originally committed as revision 10534 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-19 21:28:42 +00:00
Aurelien Jacobs
b1dc5beb12 replaces hardcoded values by the equivalent enum definitions 
Originally committed as revision 9801 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-26 13:01:09 +00:00
Panagiotis Issaris
6f3e0b2174 Replace all occurrences of AVERROR_IO with AVERROR(EIO). 
Originally committed as revision 9760 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-19 15:23:32 +00:00
Aurelien Jacobs
57004ff1d7 add an enum for need_parsing 
Originally committed as revision 8742 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-15 13:51:57 +00:00
Michael Niedermayer
87e8788680 allocate 32 extra bytes at the end of the probe buffer and remove most probe buf_size checks 
Originally committed as revision 8677 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-08 11:34:15 +00:00
Reimar Döffinger
a0bbb2e977 Use av_set_pts_info and set some arbitrary timebase fallback 
Originally committed as revision 7883 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-08 20:54:12 +00:00
Reimar Döffinger
51bd81f64d set pts_wrap_bits to 32 since timestamps in packets are 32 bit 
Originally committed as revision 7880 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-07 23:22:53 +00:00
Reimar Döffinger
2a1c3b8b90 10l, forgot to skip payload description in UMF packet parsing 
Originally committed as revision 7878 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-07 22:51:42 +00:00
Reimar Döffinger
6e8c46b7e3 Set CODEC_TYPE_DATA for timecode tracks. 
Originally committed as revision 7159 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-22 18:47:05 +00:00
Reimar Döffinger
9ed0023447 Set st->need_parsing = 2 for MPEG-content. 
Originally committed as revision 7158 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-22 18:31:28 +00:00
Diego Biurrun
c26abfa541 Rename ABS macro to FFABS. 
Originally committed as revision 6666 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-11 23:17:58 +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
b9b18fbdea both timestamps are dts, (checked trailer.gxf, spec is unclear) 
Originally committed as revision 5958 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-08 18:02:09 +00:00
Baptiste Coudurier
51a0a721ab remove unneeded audio fourcc as well 
Originally committed as revision 5889 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-02 10:37:10 +00:00