OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0815b23
)
avfilter/avfiltergraph: fix check using the wrong variables
author
Michael Niedermayer
<michaelni@gmx.at>
Thu, 25 Jul 2013 14:53:39 +0000
(16:53 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Thu, 25 Jul 2013 14:53:39 +0000
(16:53 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/avfiltergraph.c
patch
|
blob
|
history
diff --git
a/libavfilter/avfiltergraph.c
b/libavfilter/avfiltergraph.c
index
9af0e90
..
2f6f2fd
100644
(file)
--- a/
libavfilter/avfiltergraph.c
+++ b/
libavfilter/avfiltergraph.c
@@
-379,7
+379,7
@@
static int can_merge_formats(AVFilterFormats *a_arg,
int is_sample_rate)
{
AVFilterFormats *a, *b, *ret;
- if (a
== b
)
+ if (a
_arg == b_arg
)
return 1;
a = clone_filter_formats(a_arg);
b = clone_filter_formats(b_arg);