diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 04:03:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 04:03:05 +0100 |
| commit | 28eacd135162e34379b5c0146ad41a3601f35cd8 (patch) | |
| tree | 61835e7a9a60c0364efbf9a974dc83970c439a13 /libavformat/soxdec.c | |
| parent | dfd11eb2a5404d2b59073ebb8433f25c51ca084b (diff) | |
| parent | 58a868968df445068a143f327ced03b6a02baf0d (diff) | |
| download | ffmpeg-28eacd135162e34379b5c0146ad41a3601f35cd8.tar.gz | |
Merge commit '58a868968df445068a143f327ced03b6a02baf0d'
* commit '58a868968df445068a143f327ced03b6a02baf0d':
FATE: drop the last partial frame in the wmv8-drm test
Conflicts:
tests/ref/fate/wmv8-drm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/soxdec.c')
0 files changed, 0 insertions, 0 deletions