[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r10623: Remove duplicate definition
From: |
Benjamin Wolsey |
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r10623: Remove duplicate definition of SwsContextWrapper after merge from |
Date: |
Wed, 25 Feb 2009 08:02:16 +0100 |
User-agent: |
Bazaar (1.5) |
------------------------------------------------------------
revno: 10623
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Wed 2009-02-25 08:02:16 +0100
message:
Remove duplicate definition of SwsContextWrapper after merge from
release branch. It is now back in the implementation file, because there's
no benefit to having it in a header unless that header is included by all
places that use SwsContextWrapper (e.g. VideoDecoderFfmpeg).
modified:
libmedia/ffmpeg/VideoConverterFfmpeg.h
=== modified file 'libmedia/ffmpeg/VideoConverterFfmpeg.h'
--- a/libmedia/ffmpeg/VideoConverterFfmpeg.h 2009-02-25 02:00:44 +0000
+++ b/libmedia/ffmpeg/VideoConverterFfmpeg.h 2009-02-25 07:02:16 +0000
@@ -41,31 +41,6 @@
class SwsContextWrapper;
-#ifdef HAVE_SWSCALE_H
-/// A wrapper round an SwsContext that ensures it's
-/// freed on destruction.
-class SwsContextWrapper
-{
-public:
-
- SwsContextWrapper(SwsContext* context)
- :
- _context(context)
- {}
-
- ~SwsContextWrapper()
- {
- sws_freeContext(_context);
- }
-
- SwsContext* getContext() const { return _context; }
-
-private:
- SwsContext* _context;
-
-};
-#endif
-
class VideoConverterFfmpeg : public VideoConverter {
public:
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r10623: Remove duplicate definition of SwsContextWrapper after merge from,
Benjamin Wolsey <=