avconv: pass the hwaccel frames context to the decoder

232399e3 · Anton Khirnov · a3a0230a · 232399e3
Commit 232399e3 authored May 27, 2016 by Anton Khirnov
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

avconv.c avconv.c +7 -0

No files found.
--- a/avconv.c
+++ b/avconv.c
@@ -1616,6 +1616,13 @@ static enum AVPixelFormat get_format(AVCodecContext *s, const enum AVPixelFormat
            }
            continue;
        }
+
+        if (ist->hw_frames_ctx) {
+            s->hw_frames_ctx = av_buffer_ref(ist->hw_frames_ctx);
+            if (!s->hw_frames_ctx)
+                return AV_PIX_FMT_NONE;
+        }
+
        ist->active_hwaccel_id = hwaccel->id;
        ist->hwaccel_pix_fmt   = *p;
        break;