diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-08 04:48:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-08 04:53:52 +0200 |
| commit | b5a87dc193d6901a00aa4d195f1aae9519b8712f (patch) | |
| tree | fa194ed2ea8784b3f59b7d90ad74a5cf44b8943b /libavcodec/iirfilter.c | |
| parent | f982d006bb9e5ffb6bc032e62b5f34177a83df85 (diff) | |
| parent | c4abc9098cacb227dba39bac6aea16b2bceba0d0 (diff) | |
| download | ffmpeg-b5a87dc193d6901a00aa4d195f1aae9519b8712f.tar.gz | |
Merge commit 'c4abc9098cacb227dba39bac6aea16b2bceba0d0'
* commit 'c4abc9098cacb227dba39bac6aea16b2bceba0d0':
vqavideo: check the version
Conflicts:
libavcodec/vqavideo.c
See: b226af39107f09cd650875388250f4968eea54db
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/iirfilter.c')
0 files changed, 0 insertions, 0 deletions