diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-03 12:21:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-03 12:21:25 +0200 |
| commit | c3660c361822ffa9ae4fc47f655adab52a0f3c57 (patch) | |
| tree | 5a872b20159f0885fce7ec3673f33da9725653cd /libavfilter/vf_blackframe.c | |
| parent | 45a73d2b472ffcc0d87f3efae3424c44976d6935 (diff) | |
| parent | 0aed0bfc62b273a780a2bfba3be56039fccd7423 (diff) | |
| download | ffmpeg-c3660c361822ffa9ae4fc47f655adab52a0f3c57.tar.gz | |
Merge commit '0aed0bfc62b273a780a2bfba3be56039fccd7423'
* commit '0aed0bfc62b273a780a2bfba3be56039fccd7423':
vmd: fix mode 3 decoding
Conflicts:
libavcodec/vmdav.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_blackframe.c')
0 files changed, 0 insertions, 0 deletions