diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-11 21:38:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-11 21:38:55 +0100 |
| commit | 7edb5eec4fd407c55c437aaa5a38d7c8a953c14c (patch) | |
| tree | 0e212cce5208d225f9d1672eee0a81dd92ab6d36 /libavresample | |
| parent | 76bd8e16af900fe35219ebe55d49151d598d8b80 (diff) | |
| parent | 0e1ebfebc8326069732795698a82f3fea0742a54 (diff) | |
| download | ffmpeg-7edb5eec4fd407c55c437aaa5a38d7c8a953c14c.tar.gz | |
Merge commit '0e1ebfebc8326069732795698a82f3fea0742a54'
* commit '0e1ebfebc8326069732795698a82f3fea0742a54':
4xm: drop unnecessary check
Conflicts:
libavcodec/4xm.c
The check is currently redundant, it is for saftey left in place though
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample')
0 files changed, 0 insertions, 0 deletions