diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-25 03:08:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-25 03:08:19 +0200 |
| commit | 1945db1f13071aced7fcb25573980540c19156ea (patch) | |
| tree | a7f4f8d1dc84fe8fa56ad426154eb23b569c0e63 /libavformat/audiointerleave.c | |
| parent | 4ef02ddd818857e479c90bca85894a5a2e1bea9d (diff) | |
| parent | ac84c1ce24a285f9cf16d4297bce73b1c4a6e435 (diff) | |
| download | android_external_ffmpeg-1945db1f13071aced7fcb25573980540c19156ea.tar.gz android_external_ffmpeg-1945db1f13071aced7fcb25573980540c19156ea.tar.bz2 android_external_ffmpeg-1945db1f13071aced7fcb25573980540c19156ea.zip | |
Merge commit 'ac84c1ce24a285f9cf16d4297bce73b1c4a6e435'
* commit 'ac84c1ce24a285f9cf16d4297bce73b1c4a6e435':
avfilter: check filter link validity
Conflicts:
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/audiointerleave.c')
0 files changed, 0 insertions, 0 deletions