diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-23 12:44:56 +0200 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-23 12:45:00 +0200 |
commit | 0a03271ef64d67a5de0dd5dc4e12fe6503f46acb (patch) | |
tree | edc197381655854062ce07b630ea0468e0ed5117 /doc/swresample.txt | |
parent | b04b021005508e190ad02b66106c2c611b404a72 (diff) | |
parent | 7f388c0fabc51eca3106e7cc443393269435ab52 (diff) | |
download | ffmpeg-0a03271ef64d67a5de0dd5dc4e12fe6503f46acb.tar.gz |
Merge commit '7f388c0fabc51eca3106e7cc443393269435ab52'
* commit '7f388c0fabc51eca3106e7cc443393269435ab52':
asfdec: remove the wrong condition
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'doc/swresample.txt')
0 files changed, 0 insertions, 0 deletions