Merge commit 'b7254288d222013e20539c530b1ec5d324ed5352'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 01:18:44 +0000 (02:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 01:18:50 +0000 (02:18 +0100)
* commit 'b7254288d222013e20539c530b1ec5d324ed5352':
  mpegvideo: do not update last_non_b_pict_type in update_thread_context()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpegvideo.c

index cef335f..c5c50c7 100644 (file)
@@ -792,10 +792,6 @@ do {\
         s->last_pict_type = s1->pict_type;
         if (s1->current_picture_ptr)
             s->last_lambda_for[s1->pict_type] = s1->current_picture_ptr->f.quality;
-
-        if (s1->pict_type != AV_PICTURE_TYPE_B) {
-            s->last_non_b_pict_type = s1->pict_type;
-        }
     }
 
     return 0;