aboutsummaryrefslogtreecommitdiffstats
path: root/Video Tuneup/ViewController.h
diff options
context:
space:
mode:
Diffstat (limited to 'Video Tuneup/ViewController.h')
-rw-r--r--Video Tuneup/ViewController.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/Video Tuneup/ViewController.h b/Video Tuneup/ViewController.h
index fb2f19a..b045b91 100644
--- a/Video Tuneup/ViewController.h
+++ b/Video Tuneup/ViewController.h
@@ -13,7 +13,8 @@
@class PlayerView;
-@interface ViewController : UIViewController {
+// UIImagePickerControllerDelegate requires that we conform to UINavigationControllerDelegate
+@interface ViewController : UIViewController <UINavigationControllerDelegate, UIImagePickerControllerDelegate> {
AVURLAsset *asset;
AVURLAsset *songAsset;