diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-29 04:02:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-29 04:02:23 +0200 |
| commit | e755c8ac462e85e6c3de4f0207dc6bb5c86409cf (patch) | |
| tree | 79b263a53249817baa638e164c3d61d03d84f5fe /libavresample | |
| parent | ca90ca8ce365261355f3b66936b9cc011fdd1cdc (diff) | |
| parent | 4a27a52a1f74016095b7aee1b4a422cf62217ade (diff) | |
| download | ffmpeg-e755c8ac462e85e6c3de4f0207dc6bb5c86409cf.tar.gz | |
Merge commit '4a27a52a1f74016095b7aee1b4a422cf62217ade'
* commit '4a27a52a1f74016095b7aee1b4a422cf62217ade':
fate: Don't use files from SRC_PATH in the actual tests
indeo4: reuse context block VLC for band instead of defaulting
Conflicts:
tests/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample')
0 files changed, 0 insertions, 0 deletions