]> granicus.if.org Git - libvpx/commitdiff
Merge "Cosmetic clean up."
authorPaul Wilkins <paulwilkins@google.com>
Tue, 20 May 2014 09:34:56 +0000 (02:34 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 20 May 2014 09:34:56 +0000 (02:34 -0700)
1  2 
vp9/encoder/vp9_encoder.h
vp9/encoder/vp9_firstpass.c
vp9/encoder/vp9_firstpass.h

Simple merge
Simple merge
index 02a3d1f7756d375b047a6c2697ec02f756f1c799,7f31f01704bdaf345c8908990f3669f6134df8fb..d84793e28e11b0edd97fc5c53b0c14f8eb54881d
@@@ -38,9 -38,10 +38,9 @@@ typedef struct 
    int64_t spatial_layer_id;
  } FIRSTPASS_STATS;
  
struct twopass_rc {
typedef struct {
    unsigned int section_intra_rating;
    unsigned int next_iiratio;
 -  unsigned int this_iiratio;
    FIRSTPASS_STATS total_stats;
    FIRSTPASS_STATS this_frame_stats;
    const FIRSTPASS_STATS *stats_in;