Merge commit 'd4f0f2d1e80b76260eb6b9cdde472ac069dfda56'

* commit 'd4f0f2d1e80b76260eb6b9cdde472ac069dfda56':
  lavc: use buf[0] instead of data[0] as the indicator of an allocated frame

Conflicts:
	libavcodec/utils.c

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

libavcodec/utils.c

@@ -2090,7 +2090,7 @@ fail:
                 ret = avpkt->size;
         }
 
-        if (ret < 0 && picture->data[0])
+        if (ret < 0 && picture->buf[0])
             av_frame_unref(picture);
 
         if (*got_picture_ptr) {