Merge remote-tracking branch 'seife/master'

Origin commit data
------------------
Branch: master
Commit: 151fd39d45
Author: martii <m4rtii@gmx.de>
Date: 2013-05-26 (Sun, 26 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
martii
2013-05-26 08:09:50 +02:00
4 changed files with 4 additions and 4 deletions

View File

@@ -91,7 +91,7 @@ typedef enum {
VIDEO_STD_1080P25,
VIDEO_STD_AUTO,
VIDEO_STD_1080P50, /* SPARK only */
VIDEO_STD_MAX = VIDEO_STD_1080P50
VIDEO_STD_MAX
} VIDEO_STD;
/* not used, for dummy functions */