← Back to branch summary

~ubuntu-branches/ubuntu/trusty/libavg/trusty

« back to all changes in this revision

Viewing changes to src/player/VideoWriterThread.cpp

  • Committer: Package Import Robot
  • Author(s): OXullo Intersecans
  • Date: 2012-01-29 19:26:37 UTC
  • mfrom: (1.1.7)
  • Revision ID: package-import@ubuntu.com-20120129192637-ck9os7t5x3adl92x
Tags: 1.7.1-0ubuntu1
https://launchpad.net/bugs/923302
New upstream release (LP: #923302)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/player/VideoWriterThread.cpp
26
26
#include "../base/ScopeTimer.h"
27
27
#include "../base/StringHelper.h"
28
28
 
 
29
#if LIBAVFORMAT_VERSION_MAJOR > 52
 
30
#include <libavutil/mathematics.h>
 
31
#endif
 
32
 
29
33
using namespace std;
30
34
 
31
35
namespace avg {
164
168
 
165
169
    m_pFrameConversionContext = sws_getContext(m_Size.x, m_Size.y, 
166
170
            ::PIX_FMT_RGB32, m_Size.x, m_Size.y, STREAM_PIXEL_FORMAT, 
167
 
            SWS_FAST_BILINEAR, NULL, NULL, NULL);
 
171
            SWS_BILINEAR, NULL, NULL, NULL);
168
172
 
169
173
    m_pConvertedFrame = createFrame(STREAM_PIXEL_FORMAT, m_Size);
170
174