[FFmpeg-cvslog] avfilter/avfiltergraph: fix check using the wrong variables
Michael Niedermayer
git at videolan.org
Thu Jul 25 17:15:52 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jul 25 16:53:39 2013 +0200| [6bde1e9d14ff1e0ecff74b8ff59607f545c6f2ec] | committer: Michael Niedermayer
avfilter/avfiltergraph: fix check using the wrong variables
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6bde1e9d14ff1e0ecff74b8ff59607f545c6f2ec
---
libavfilter/avfiltergraph.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c
index 9af0e90..2f6f2fd 100644
--- 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);
More information about the ffmpeg-cvslog
mailing list