ffmpeg | branch: release/2.4 | Michael Niedermayer <[email protected]> | Sun Jan 
18 01:11:20 2015 +0100| [fefb152cd94c1d52cc4bf6d42d194a1f4f3e316d] | committer: 
Michael Niedermayer

Merge commit 'a7e79f6a43bdc7e3b164dd78b060f0d5575a0cf0' into release/2.4

* commit 'a7e79f6a43bdc7e3b164dd78b060f0d5575a0cf0':
  avfilter: check filter link validity

Conflicts:
        libavfilter/avfilter.c

Merged-by: Michael Niedermayer <[email protected]>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fefb152cd94c1d52cc4bf6d42d194a1f4f3e316d
---



_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to