projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
upgrade to ffmpeg-2.8
[goodguy/history.git]
/
cinelerra-5.0
/
cinelerra
/
filejpeglist.C
diff --git
a/cinelerra-5.0/cinelerra/filejpeglist.C
b/cinelerra-5.0/cinelerra/filejpeglist.C
index 6fc86ae41fd8c8dc80193cc9240dd09e22f3a9a3..bfd801d20e745397bb51f820127cba18a3396442 100644
(file)
--- a/
cinelerra-5.0/cinelerra/filejpeglist.C
+++ b/
cinelerra-5.0/cinelerra/filejpeglist.C
@@
-26,7
+26,6
@@
#include "libmjpeg.h"
#include "mwindow.inc"
#include "jpegwrapper.h"
#include "libmjpeg.h"
#include "mwindow.inc"
#include "jpegwrapper.h"
-#include "quicktime.h"
#include "vframe.h"
#include <ctype.h>
#include "vframe.h"
#include <ctype.h>
@@
-75,10
+74,7
@@
int FileJPEGList::can_copy_from(Asset *asset)
{
if(asset->format == FILE_JPEG_LIST)
return 1;
{
if(asset->format == FILE_JPEG_LIST)
return 1;
- else
- if(asset->format == FILE_MOV && match4(asset->vcodec, QUICKTIME_JPEG))
- return 1;
-
+
return 0;
}
return 0;
}