Merge "args.h: add arg_parse_enum prototype"

vp9/encoder/vp9_rdopt.c

diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c
index e667272..462bdeb 100644
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -3448,7 +3448,7 @@
   // updating code causes PSNR loss. Need to figure out the confliction.
   x->skip |= best_mode_skippable;
 
-  if (!best_mode_skippable && !x->select_tx_size) {
+  if (!x->skip && !x->select_tx_size) {
     int has_high_freq_coeff = 0;
     int plane;
     int max_plane = is_inter_block(&xd->mi[0].src_mi->mbmi)