diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 02:18:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 02:18:50 +0100 |
| commit | d5050bae801ff789c188d9e426dae6018a5f709f (patch) | |
| tree | 8626e7489655d7fa646aab0a3db1d891bfa08061 /libavcodec/mpegvideo.c | |
| parent | 20b28fc7b0aaa41c1837bf234e599d1714bc4d35 (diff) | |
| parent | b7254288d222013e20539c530b1ec5d324ed5352 (diff) | |
| download | ffmpeg-d5050bae801ff789c188d9e426dae6018a5f709f.tar.gz | |
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>
Diffstat (limited to 'libavcodec/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index cef335f601..c5c50c7ef0 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -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; |