Merge commit '598ce4ab4f1893e0661fc038101487e511937877'

* commit '598ce4ab4f1893e0661fc038101487e511937877':
  h264: call av_frame_unref() instead of avcodec_get_frame_defaults().

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/h264.c
index 0028227,07a93cf..90c4ca8
--- 1/libavcodec/h264.c
--- 2/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@@ -1806,17 -1730,6 +1806,17 @@@ static int decode_update_thread_context
          h->mb_type_pool      = NULL;
          h->ref_index_pool    = NULL;
          h->motion_val_pool   = NULL;
-         avcodec_get_frame_defaults(&h->cur_pic.f);
 +        for (i = 0; i < 2; i++) {
 +            h->rbsp_buffer[i] = NULL;
 +            h->rbsp_buffer_size[i] = 0;
 +        }
 +
 +        if (h1->context_initialized) {
 +        h->context_initialized = 0;
 +
 +        memset(&h->cur_pic, 0, sizeof(h->cur_pic));
++        av_frame_unref(&h->cur_pic.f);
 +        h->cur_pic.tf.f = &h->cur_pic.f;
  
          ret = ff_h264_alloc_tables(h);
          if (ret < 0) {