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)
commitd5050bae801ff789c188d9e426dae6018a5f709f
tree8626e7489655d7fa646aab0a3db1d891bfa08061
parent20b28fc7b0aaa41c1837bf234e599d1714bc4d35
parentb7254288d222013e20539c530b1ec5d324ed5352
Merge commit 'b7254288d222013e20539c530b1ec5d324ed5352'

* 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