[svn] / trunk / xvidcore / vfw / src / codec.c Repository:
ViewVC logotype

Diff of /trunk/xvidcore/vfw/src/codec.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1914, Tue Dec 21 16:56:42 2010 UTC revision 1917, Wed Dec 22 16:52:12 2010 UTC
# Line 19  Line 19 
19   *      along with this program; if not, write to the Free Software   *      along with this program; if not, write to the Free Software
20   *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.   *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21   *   *
22   * $Id: codec.c,v 1.28 2010-12-21 16:56:42 Isibaar Exp $   * $Id: codec.c,v 1.29 2010-12-22 16:52:12 Isibaar Exp $
23   *   *
24   *************************************************************************/   *************************************************************************/
25    
# Line 433  Line 433 
433          else          else
434          create.num_threads = info.num_threads; /* Autodetect */          create.num_threads = info.num_threads; /* Autodetect */
435    
436            /* Encoder slices */
437            if ((profiles[codec->config.profile].flags & PROFILE_RESYNCMARKER) && codec->config.num_slices != 1) {
438    
439                    if (codec->config.num_slices == 0) { /* auto */
440                            int rows = (lpbiInput->bmiHeader.biHeight + 15) / 16;
441                            int slices = (rows > 36) ? 2 : 1;
442    
443                            create.num_slices = (rows > 45) ? 4 : slices;
444    
445                            if (create.num_slices > create.num_threads)
446                                    create.num_slices = create.num_threads;
447                    }
448                    else {
449                            create.num_slices = codec->config.num_slices;
450                    }
451    
452            }
453    
454          /* plugins */          /* plugins */
455          create.plugins = plugins;          create.plugins = plugins;
456          switch (codec->config.mode)          switch (codec->config.mode)

Legend:
Removed from v.1914  
changed lines
  Added in v.1917

No admin address has been configured
ViewVC Help
Powered by ViewVC 1.0.4