diff options
| author | Tim Redfern <tim@eclectronics.org> | 2013-08-29 15:35:58 +0100 |
|---|---|---|
| committer | Tim Redfern <tim@eclectronics.org> | 2013-08-29 15:35:58 +0100 |
| commit | feb34d02ff8ef3c9cbe9e5a948a461c81d9b4d1a (patch) | |
| tree | ddfec0212c0969e6976cd7099008fa87f55083ce /rotord/src/rotor.h | |
| parent | 486a76df31169f2b510ae26e8252783d8f90de27 (diff) | |
| parent | 1aacbf3bb5dee98bc5ab4994e1907a8416811941 (diff) | |
Merge branch 'master' of eclectronics.org@eclectronics.org:rotor
Diffstat (limited to 'rotord/src/rotor.h')
| -rwxr-xr-x | rotord/src/rotor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rotord/src/rotor.h b/rotord/src/rotor.h index 77f7743..ae6b849 100755 --- a/rotord/src/rotor.h +++ b/rotord/src/rotor.h @@ -1242,7 +1242,7 @@ namespace Rotor { bool parseXml(string media_path); bool parseJson(string &data,string &media_path); bool set_resolution(int w,int h); - bool preview(xmlIO &XML,string node,int frame,int w,int h); + bool preview(xmlIO &XML,string &node,string &format,int frame,int w,int h); bool loaded; float duration; float framerate; |