[FFmpeg-cvslog] h264: Mark previous field as done before throwing it away.

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Feb 11 20:11:18 2012 +0100| [f900d601784ca69b5760bff5cb8f6dae333a79da] | committer: Michael Niedermayer

h264: Mark previous field as done before throwing it away.

This fixes some deadlock without the generic cleanup code.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f900d601784ca69b5760bff5cb8f6dae333a79da
---

 libavcodec/h264.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 48aaddf..b9057ad 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -2943,6 +2943,8 @@ static int decode_slice_header(H264Context *h, H264Context *h0){
 
             } else {
                 if (s0->current_picture_ptr->frame_num != h->frame_num) {
+                    ff_thread_report_progress((AVFrame*)s0->current_picture_ptr, INT_MAX,
+                                              s0->picture_structure==PICT_BOTTOM_FIELD);
                     /*
                      * This and previous field had
                      * different frame_nums. Consider this field first in