virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
34,291 Commits 37 Branches 400 Tags 460 MiB
22fe93ea39
Commit Graph

81 Commits

Author SHA1 Message Date
Michael Niedermayer
e10979ff56 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  changelog: misc typo and wording fixes
  H.264: add filter_mb_fast support for >8-bit decoding
  doc: Remove outdated comments about gcc 2.95 and gcc 3.3 support.
  lls: use av_lfg instead of rand() in test program
  build: remove unnecessary dependency on libs from 'all' target
  H.264: avoid redundant alpha/beta calculations in loopfilter
  H.264: optimize intra/inter loopfilter decision
  mpegts: fix Continuity Counter error detection
  build: remove unnecessary FFLDFLAGS variable
  vp8/mt: flush worker thread, not application thread context, on seek.
  mt: proper locking around release_buffer calls.
  DxVA2: unbreak build after [657ccb5ac7]
  hwaccel: unbreak build
  Eliminate FF_COMMON_FRAME macro.

Conflicts:
	Changelog
	Makefile
	doc/developer.texi
	libavcodec/avcodec.h
	libavcodec/h264.c
	libavcodec/mpeg4videodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-07-12 01:42:32 +02:00
Mans Rullgard
1765aacb17 hwaccel: unbreak build 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-10 23:58:26 +01: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
Nicolas Kaiser
fe655f6723 Simplify: Remove impossible condition. 
Patch by Nicolas Kaiser, nikai nikai net

Originally committed as revision 25714 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-09 23:58:41 +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
Stefano Sabatini
04a5c106f9 Consistently use third person in doxies. 
Originally committed as revision 20388 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-27 20:36:17 +00:00
Ivan Kalvachev
21effaa4b2 Change the type of pblocks from pointers to short array into 
pointers to array of 64 DCTELEM, similarly to other block fields.
This also get rid of some casts and fixes a warning.

Originally committed as revision 17517 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-22 09:02:06 +00:00
Ivan Kalvachev
859bb3cfee Add more paranoid checks of xvmc token. 
Originally committed as revision 17453 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-19 09:55:52 +00:00
Diego Biurrun
2213f431c7 Directly #include required X11/XvMC header. 
Originally committed as revision 17450 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-19 00:47:11 +00:00
Diego Biurrun
7df33ec28e Replace sizeof(short) by the more robust sizeof(*s->pblocks[i]) in memset and 
memcpy calls.  s->pblocks is the element actually being handled.

Originally committed as revision 17404 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-17 23:51:28 +00:00
Diego Biurrun
63864cb810 small Doxygen comment grammar fix 
Originally committed as revision 17403 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-17 23:36:28 +00:00
Diego Biurrun
bd0eddb795 Revert converting two asserts into if checks and error messages. 
It did not achieve the intended effect.

Originally committed as revision 17402 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-17 23:35:41 +00:00
Ivan Kalvachev
649c171aec Thoroughly check all fields set by the application in xvmc struct. 
Originally committed as revision 17387 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-16 22:46:30 +00:00
Diego Biurrun
42dfc2bfa9 whitespace cosmetics: Place spaces around += for better readability. 
Originally committed as revision 17368 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-16 11:35:38 +00:00
Diego Biurrun
f9d5bf3c2d Replace two asserts by checks and error messages. 
Originally committed as revision 17362 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-16 02:02:49 +00:00
Diego Biurrun
6545996fb9 whitespace cosmetics 
Originally committed as revision 17358 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-16 01:33:02 +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
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
Diego Biurrun
864899c329 cosmetics: typo fix 
Originally committed as revision 17346 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-15 20:37:39 +00:00
Diego Biurrun
d758a5cb50 spelling/grammar/wording fixes for Doxygen comments 
Originally committed as revision 17344 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-15 19:10:16 +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
Ivan Kalvachev
3d43e42f29 Document all functions in mpegvideo_xvmc. 
Originally committed as revision 17340 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-15 18:30:39 +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
Diego Biurrun
9043202e6e K&R whitespace cosmetics 
Originally committed as revision 17337 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-15 16:54:02 +00:00
Diego Biurrun
c1e7b256ec 10l: Remove duplicated hunk of code. 
Originally committed as revision 17335 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-15 16:29:31 +00:00
Ivan Kalvachev
9e0a8a368e Cosmetics. Vertical align. 
Originally committed as revision 17319 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-15 10:15:02 +00:00
Ivan Kalvachev
d76c5ed574 Almost cosmetics. 
Move some assignments after the checks.

Originally committed as revision 17318 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-15 10:14:16 +00:00
Ivan Kalvachev
d2d600b71f Check all critical xvmc struct fields in ff_xvmc_field_start() 
and log error if they are not correct. All other functions
are supposedly called after that one, so use assert() for them.

Originally committed as revision 17317 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-15 10:06:23 +00:00
Ivan Kalvachev
afb9342a3e Proper condition in xvmc decode mb. 
The old one would try to use mv blocks that are written outside their buffer,
in case of unhandled error.

Originally committed as revision 17315 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-15 09:03:47 +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
1a90cf3c98 Revert 17308. 
The above commit makes ff_xvmc_decode_mb to output one log entry
for each decoded MB, causing massive slowdown.

Originally committed as revision 17312 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-15 07:55:39 +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
Diego Biurrun
1333d8fd20 Replace assert in ff_xvmc_field_end() by av_log call at level AV_LOG_ERROR. 
Originally committed as revision 17308 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-15 02:27:55 +00:00
Diego Biurrun
967d2ae616 Remove redundant assert(render) in ff_xvmc_init_block(). The immediately 
following if condition checks render and does an assert if it fails.

Originally committed as revision 17304 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-15 01:24:09 +00:00
Diego Biurrun
e26f8d76d7 Remove asserts that are immediately followed by a check and error return. 
Originally committed as revision 17303 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-15 00:52:16 +00:00
Diego Biurrun
8f38ff007a Doxygen comment/explanation for ff_xvmc_init_block(). 
Originally committed as revision 17301 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-15 00:16:51 +00:00
Diego Biurrun
0b2eb2e8be Add Doxygen comment similar to ff_xvmc_field_start() to ff_xvmc_field_end(). 
Originally committed as revision 17296 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-14 23:13:32 +00:00
Diego Biurrun
fe4be5dbd5 whitespace cosmetics: remove stray space 
Originally committed as revision 17295 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-14 23:08:43 +00:00
Diego Biurrun
9107f7cd07 Doxygenize ff_xvmc_field_start() comment. 
Originally committed as revision 17292 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-14 22:48:59 +00:00
Diego Biurrun
a1bce01171 Clarify ff_xvmc_field_start() comment. 
Originally committed as revision 17291 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-14 22:46:40 +00:00
Diego Biurrun
b71bd0ed11 Merge some declarations and initializations. 
Originally committed as revision 17288 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-14 22:21:17 +00:00
Ivan Kalvachev
013cebfbe8 Return error instead of triggering assert. 
Originally committed as revision 17287 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-14 22:06:00 +00:00
Diego Biurrun
930efaf410 cosmetics: comment wording/grammar 
Originally committed as revision 17286 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-14 21:52:44 +00:00
Diego Biurrun
6e4b41f880 cosmetics: Change '8*8' to '64'. 
Originally committed as revision 17285 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-14 21:50:46 +00:00
Diego Biurrun
cb18fb6288 cosmetics: K&R style 
Originally committed as revision 17284 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-14 21:49:48 +00:00
Ivan Kalvachev
9939841fe2 Give nice message for failed assert. 
Originally committed as revision 17283 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-14 21:33:13 +00:00
Diego Biurrun
4440bd0da4 Add xvmc_internal.h that contains all internal xvmc function declarations. 
This allows getting rid of a bunch of ugly forward declarations.

Originally committed as revision 17280 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-14 20:37:14 +00:00