1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Commit Graph

56 Commits

Author SHA1 Message Date
Michael Niedermayer
86e107a7d4 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  cosmetics: Consistently use C-style comments with multiple inclusion guards
  anm: fix a few Doxygen comments
  misc typo and wording fixes
  attributes: add av_noreturn
  attributes: drop pointless define guards
  configure: do not disable av_always_inline with --enable-small
  flvdec: initial stream switch support
  avplay: fix write on freed memory for rawvideo
  snow: remove a VLA used for edge emulation
  x86: lavfi: fix gradfun/yadif build with mmx/sse disabled
  snow: remove the runs[] VLA.
  snow: Check mallocs at init
  flacdec: remove redundant setting of avctx->sample_fmt

Conflicts:
	ffplay.c
	libavcodec/h264.c
	libavcodec/snow.c
	libavcodec/snow.h
	libavcodec/snowdec.c
	libavcodec/snowenc.c
	libavformat/flvdec.c
	libavutil/attributes.h
	tools/patcheck

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-04 00:32:31 +02:00
Diego Biurrun
09f211987c misc typo and wording fixes 2012-07-03 17:35:11 +02:00
Michael Niedermayer
e387c9d5dd Merge remote-tracking branch 'qatar/master'
* qatar/master: (22 commits)
  rv40dsp x86: use only one register, for both increment and loop counter
  rv40dsp: implement prescaled versions for biweight.
  avconv: use default channel layouts when they are unknown
  avconv: parse channel layout string
  nutdec: K&R formatting cosmetics
  vda: Signal 4 byte NAL headers to the decoder regardless of what's in the extradata
  mem: Consistently return NULL for av_malloc(0)
  vf_overlay: implement poll_frame()
  vf_scale: support named constants for sws flags.
  lavc doxy: add all installed headers to doxy groups.
  lavc doxy: add avfft to the main lavc group.
  lavc doxy: add remaining avcodec.h functions to a misc doxygen group.
  lavc doxy: add AVPicture functions to a doxy group.
  lavc doxy: add resampling functions to a doxy group.
  lavc doxy: replace \ with /
  lavc doxy: add encoding functions to a doxy group.
  lavc doxy: add decoding functions to a doxy group.
  lavc doxy: fix formatting of AV_PKT_DATA_{PARAM_CHANGE,H263_MB_INFO}
  lavc doxy: add AVPacket-related stuff to a separate doxy group.
  lavc doxy: add core functions/definitions to a doxy group.
  ...

Conflicts:
	ffmpeg.c
	libavcodec/avcodec.h
	libavcodec/vda.c
	libavcodec/x86/rv40dsp.asm
	libavfilter/vf_scale.c
	libavformat/nutdec.c
	libavutil/mem.c
	tests/ref/acodec/pcm_s24daud

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-10 22:53:25 +02:00
Anton Khirnov
7c59b5c2a5 lavc doxy: add all installed headers to doxy groups. 2012-04-09 21:25:17 +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
3453a231a6 lavc: remove misc disabled cruft. 2011-04-19 19:01:22 +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
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
Diego Biurrun
b91813b6da Improve description of next_free_data_block_num struct member.
Originally committed as revision 17960 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-14 17:20:28 +00:00
Diego Biurrun
9ba8bc0164 spelling/grammar/wording fixes for the Doxygen comments
Originally committed as revision 17400 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-17 22:36:48 +00:00
Ivan Kalvachev
02c0c8d17d Minor clarification of xvmc field description.
Originally committed as revision 17384 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-16 18:19:48 +00:00
Ivan Kalvachev
e7de624bcc Improvements in xvmc structure fields descriptions.
Originally committed as revision 17383 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-16 18:16:23 +00:00
Diego Biurrun
e7c88eb76f Doxygen comment wording fix
Originally committed as revision 17361 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-16 01:59:51 +00:00
Diego Biurrun
cad1928f15 Give struct members more sensible names:
total_number_of_mv_blocks   --> allocated_mv_blocks
total_number_of_data_blocks --> allocated_data_blocks

Originally committed as revision 17356 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-16 00:21:16 +00:00
Diego Biurrun
648410c1fc cosmetics: one more wording fix
Originally committed as revision 17355 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-16 00:09:00 +00:00
Diego Biurrun
df9d2e04bb cosmetics: Keep lines below 80 characters where sensibly possible.
Originally committed as revision 17354 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-16 00:06:32 +00:00
Diego Biurrun
037f13fe21 Doxygen spelling/wording fixes
Originally committed as revision 17353 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-15 23:55:34 +00:00
Diego Biurrun
2f953883e3 spelling/wording fixes for the Doxygen comments
Originally committed as revision 17352 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-15 23:23:39 +00:00
Diego Biurrun
8f66518d0b draw_horiz_band() is really ff_draw_horiz_band().
Originally committed as revision 17350 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-15 21:05:48 +00:00
Diego Biurrun
058bcd7b6b spelling/grammar/wording/whitespace for Doxygen comments
Originally committed as revision 17349 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-15 21:03:52 +00:00
Diego Biurrun
4e30fa6e7b Rename AV_XVMC_RENDER_MAGIC constant to AV_XVMC_ID to reflect a similar
change in the name of the struct member xvmc_id.

Originally committed as revision 17348 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-15 20:45:33 +00:00
Ivan Kalvachev
ad0405fc03 Describe all fields in xvmc struct.
Originally committed as revision 17345 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-15 20:13:00 +00:00
Diego Biurrun
1909fadea9 comment spelling/grammar/wording fixes
Originally committed as revision 17343 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-15 19:06:05 +00:00
Diego Biurrun
e98b47557b Explain how AV_XVMC_RENDER_MAGIC got its seemingly arbitrary value.
Originally committed as revision 17342 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-15 18:59:18 +00:00
Ivan Kalvachev
1fcef40847 Rename unique_id to the way michaelni likes it. (xvmc_id)
Originally committed as revision 17341 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-15 18:45:22 +00:00
Diego Biurrun
f602b044b5 Rename xvmc_pixfmt_render structure to xvmc_pix_fmt.
Originally committed as revision 17339 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-15 17:42:08 +00:00
Ivan Kalvachev
11f8aa042d Kill the magic field in xvmc structure.
Originally committed as revision 17338 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-15 17:21:37 +00:00
Ivan Kalvachev
095edd3e61 Rename xvmc_render_state to something with pixfmt in its name.
Originally committed as revision 17314 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-15 08:42:11 +00:00
Ivan Kalvachev
3fff9d92dc A little better wording of doxygen comments.
Originally committed as revision 17313 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-15 08:29:06 +00:00
Ivan Kalvachev
a0723a4d84 Give a little better name to the magic(_id) field in xvmc struct
Originally committed as revision 17310 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-15 02:36:43 +00:00
Ivan Kalvachev
eb3b2ef91d Remove obsolete display_flags member from xvmc struct
and mark state defines as obsolete.

Originally committed as revision 17307 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-15 02:17:48 +00:00
Ivan Kalvachev
72d38a749b Detailed description of the interesting fields in xvmc struct.
Originally committed as revision 17306 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-15 01:35:32 +00:00
Ivan Kalvachev
f851909579 Move the state field in the xvmc struct to the extensions section.
It has always been a workaround for MPlayer limitations.

Originally committed as revision 17305 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-15 01:28:50 +00:00
Diego Biurrun
3af6c3dd9a Drop struct members display_flags and state with the next major version bump.
They are not used within FFmpeg.

Originally committed as revision 17302 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-15 00:40:57 +00:00
Diego Biurrun
4b72239059 Remove completely unsed structure fields mc_type and chroma_format.
Their only user, MPlayer, has already been updated not to use them anymore.

Originally committed as revision 17300 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-15 00:09:28 +00:00
Diego Biurrun
05c363e90d whitespace consistency cosmetics
Originally committed as revision 17299 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 23:48:11 +00:00
Diego Biurrun
5d6c111098 Add avcodec.h #include so that LIBAVCODEC_VERSION_MAJOR is not undefined.
Originally committed as revision 17298 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 23:45:35 +00:00
Ivan Kalvachev
3bffe5fc9d Deprecate some unused xvmc structure fields.
Originally committed as revision 17297 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 23:28:09 +00:00
Diego Biurrun
a1db3b93c0 cosmetics: grammar/spelling/wording fixes in comments
Originally committed as revision 17269 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 19:33:09 +00:00
Diego Biurrun
6c7b70fbd6 Remove compatibility layer for old names of xvmc definitions.
The header was non-public before and the only user, MPlayer, was updated.

Originally committed as revision 17263 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 19:08:47 +00:00
Diego Biurrun
c1a5aa2953 whitespace cosmetics: Restore vertical alignment.
Originally committed as revision 17253 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 18:15:59 +00:00
Ivan Kalvachev
aae667ba4d clarify xvmc struct fields usage distribution (internal communication)
Originally committed as revision 17252 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 18:06:05 +00:00
Ivan Kalvachev
6785e509d4 doxygen style comments
Originally committed as revision 17251 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 17:56:51 +00:00
Diego Biurrun
c97dffbc94 Replace useless X11 #includes by the one that actually provides the required
declarations of XvMCMacroBlock and XvMCSurface.

Originally committed as revision 17250 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 17:52:30 +00:00
Diego Biurrun
6b6ea1dfdf whitespace cosmetics: vertical alignment
Originally committed as revision 17249 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 17:45:38 +00:00
Diego Biurrun
e0dcbda24b Fix non-Doxygen comment.
Originally committed as revision 17248 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 17:42:40 +00:00
Diego Biurrun
1369e003f6 Add avcodec.h #include so that LIBAVCODEC_VERSION_MAJOR is not undefined.
Originally committed as revision 17247 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 17:37:42 +00:00
Ivan Kalvachev
4f7e6f0d58 vertically align xvmc struct member comments
Originally committed as revision 17246 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 17:28:39 +00:00
Ivan Kalvachev
117f9234c8 Rename xvmc flags to follow ffmpeg AV_ notion.
preserve MP_ ones until next major bump.

Originally committed as revision 17245 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 17:24:01 +00:00
Diego Biurrun
ea375af8c9 Give public #defines that are used by MPlayer an AV_ prefix.
Originally committed as revision 17244 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 17:12:25 +00:00