From eaf39938d2ca89251254f6ee8cc8516e9fbe8e85 Mon Sep 17 00:00:00 2001 From: Andreas Brachold Date: Thu, 9 Oct 2008 16:32:01 +0000 Subject: * update to build with ffmpeg-svn (r15589) --- contrib/vdr2jpeg/HISTORY | 3 +++ contrib/vdr2jpeg/LIESMICH | 4 ++-- contrib/vdr2jpeg/README | 2 +- contrib/vdr2jpeg/ffm.cpp | 1 + 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/contrib/vdr2jpeg/HISTORY b/contrib/vdr2jpeg/HISTORY index 17cf0e6..c5ab67e 100644 --- a/contrib/vdr2jpeg/HISTORY +++ b/contrib/vdr2jpeg/HISTORY @@ -1,3 +1,6 @@ + small fixes to build gcc 4.3 + update to build with ffmpeg-svn (r15589) + remove predefined include to ffmpeg libraries, unneeded by pkg-config 0.1.0 update to build with ffmpeg-svn (r12129) refactoring modules diff --git a/contrib/vdr2jpeg/LIESMICH b/contrib/vdr2jpeg/LIESMICH index afc3452..a1cf75d 100644 --- a/contrib/vdr2jpeg/LIESMICH +++ b/contrib/vdr2jpeg/LIESMICH @@ -6,14 +6,14 @@ um Vorschaubilder von Aufnahmen zu generieren. Erfordernisse ------------- -ffmpeg-svn (getestet mit r12129) +ffmpeg-svn (getestet mit r15589) Empfohlen ------------ ffmpeg als shared libary und mit Software Scaler $ cd ffmpeg && \ - ./configure --enable-shared --enable-swscaler && \ + ./configure --enable-shared --enable-swscale && \ make && \ make install diff --git a/contrib/vdr2jpeg/README b/contrib/vdr2jpeg/README index 161c5b3..3c1f5ba 100644 --- a/contrib/vdr2jpeg/README +++ b/contrib/vdr2jpeg/README @@ -5,7 +5,7 @@ vdr2jpeg are used from xxv to generated preview images of recordings. Requirements ------------- -ffmpeg-svn (tested with r14788) +ffmpeg-svn (tested with r15589) Recommended ------------ diff --git a/contrib/vdr2jpeg/ffm.cpp b/contrib/vdr2jpeg/ffm.cpp index 348ef7f..d52cf36 100644 --- a/contrib/vdr2jpeg/ffm.cpp +++ b/contrib/vdr2jpeg/ffm.cpp @@ -1130,6 +1130,7 @@ static bool new_video_stream(AVFormatContext *oc) video_enc->sample_aspect_ratio = av_d2q(frame_aspect_ratio*video_enc->height/video_enc->width, 255); video_enc->pix_fmt = frame_pix_fmt; + st->sample_aspect_ratio = video_enc->sample_aspect_ratio; if(codec && codec->pix_fmts){ const enum PixelFormat *p= codec->pix_fmts; -- cgit v1.2.3