Merge commit 'ebc29519d1634bfeb386c20a5d8a52837aae2436'

* commit 'ebc29519d1634bfeb386c20a5d8a52837aae2436': hwaccel: Support specific frame allocators Conflicts: libavcodec/utils.c

Michael Niedermayer committed 12 years ago

Commit c4fe50b2 parents fa0f7c0 ebc29512 files · +14 −2Browse files

Unified · Split

2 files

      */
     struct AVHWAccel *next;
+    /**
+     * Allocate a custom buffer
+     */
+    int (*alloc_frame)(AVCodecContext *avctx, AVFrame *frame);
     /**
      * Called at the beginning of each frame or field picture.
      *

 static int get_buffer_internal(AVCodecContext *avctx, AVFrame *frame, int flags)
 {
+    const AVHWAccel *hwaccel = avctx->hwaccel;
     int override_dimensions = 1;
     int ret;
     if ((ret = ff_init_buffer_info(avctx, frame)) < 0)
         return ret;
+    if (hwaccel && hwaccel->alloc_frame) {
+        ret = hwaccel->alloc_frame(avctx, frame);
+        goto end;
+    }
 #if FF_API_GET_BUFFER
 FF_DISABLE_DEPRECATION_WARNINGS
     /*
          * avcodec_default_get_buffer
          */
         if (frame->buf[0])
-            goto end;
+            goto end0;
         priv = av_mallocz(sizeof(*priv));
         if (!priv) {
         av_buffer_unref(&dummy_buf);
-end:
+end0:
         frame->width  = avctx->width;
         frame->height = avctx->height;
     ret = avctx->get_buffer2(avctx, frame, flags);
+end:
     if (avctx->codec_type == AVMEDIA_TYPE_VIDEO && !override_dimensions) {
         frame->width  = avctx->width;
         frame->height = avctx->height;

Keyboard shortcuts