diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-08 21:08:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-08 21:18:36 +0200 |
| commit | a26ecba07514317d500d1af64bdfc5b53148c408 (patch) | |
| tree | 55e449a10cba6eb6f491380944567945b3743201 /libavcodec/sipr16k.c | |
| parent | eee6ad38f99ad38b7d60382f572cbd5542a80c4c (diff) | |
| parent | 52a1c32c0a86e84d43f977c5148e62975a0c6917 (diff) | |
| download | ffmpeg-a26ecba07514317d500d1af64bdfc5b53148c408.tar.gz | |
Merge commit '52a1c32c0a86e84d43f977c5148e62975a0c6917'
* commit '52a1c32c0a86e84d43f977c5148e62975a0c6917':
nut: Use nut->version in the version range check
Conflicts:
libavformat/nutdec.c
Note, this bug did not affect ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sipr16k.c')
0 files changed, 0 insertions, 0 deletions