projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
eaf6f10
)
ffmpeg: Remove hw_device_ctx output filter reinit hack
author
Mark Thompson
<sw@jkqxz.net>
Wed, 22 Mar 2017 21:19:11 +0000
(21:19 +0000)
committer
Mark Thompson
<sw@jkqxz.net>
Sun, 26 Mar 2017 19:38:44 +0000
(20:38 +0100)
This was skipped in
c17563c5d3c974a69709ebae0171534763b3051c
because
it depended on the filter setup merge, but was forgotten after that
actually happened.
Fixes hwaccel fate for stream size change tests.
ffmpeg_filter.c
patch
|
blob
|
history
diff --git
a/ffmpeg_filter.c
b/ffmpeg_filter.c
index
5cc640d
..
219e473
100644
(file)
--- a/
ffmpeg_filter.c
+++ b/
ffmpeg_filter.c
@@
-460,7
+460,7
@@
static int configure_output_video_filter(FilterGraph *fg, OutputFilter *ofilter,
if (ret < 0)
return ret;
- if (
!hw_device_ctx && (ofilter->width || ofilter->height)
) {
+ if (
ofilter->width || ofilter->height
) {
char args[255];
AVFilterContext *filter;
AVDictionaryEntry *e = NULL;