diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-17 13:35:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-17 13:35:27 +0200 |
| commit | 9d1155dae303c20f51ae8579df1b8c3928c3bf21 (patch) | |
| tree | c1589f4d4269667a6b10d7c04574105e7962c5db /ffmpeg_filter.c | |
| parent | ee73a69020a8343e827a21a0de92ca1b05f89588 (diff) | |
| parent | aeb23fc4549a25ef32ff085d2a76227f90caf403 (diff) | |
Merge commit 'aeb23fc4549a25ef32ff085d2a76227f90caf403'
* commit 'aeb23fc4549a25ef32ff085d2a76227f90caf403':
avprobe: Remove a pointless check
Conflicts:
avprobe.c
No change as the code does not exist in ffprobe
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_filter.c')
0 files changed, 0 insertions, 0 deletions