Fix in select_videofps a merge conflict error.beta-push
commit31b2632ed33dc21ca1916fa93205f0ef4c4fa5fa
authorKRKeegan <-NOSPAM-kevin@krkeegan.com>
Sun, 4 May 2008 20:46:26 +0000 (4 13:46 -0700)
committerKRKeegan <-NOSPAM-kevin@krkeegan.com>
Sun, 4 May 2008 20:46:26 +0000 (4 13:46 -0700)
treec79bd42ca1f495e914b39959d65336144aa248b2
parenta32cf548354a29973115a0fbe4631bd0a7e3066e
Fix in select_videofps a merge conflict error.
plugins/video/transcode.py