From ca2cc9d816b431d3e2f6e36f4bc8c67d1ca69c99 Mon Sep 17 00:00:00 2001 From: ddennedy Date: Sat, 8 Nov 2008 07:21:29 +0000 Subject: [PATCH] producer_avformat.c: inadvertantly left something commented in the previous commit. git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@1226 d19143bc-622f-0410-bfdd-b5b2a6649095 --- src/modules/avformat/producer_avformat.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c index 7f294bb..70fc572 100644 --- a/src/modules/avformat/producer_avformat.c +++ b/src/modules/avformat/producer_avformat.c @@ -167,11 +167,11 @@ static double get_aspect_ratio( AVStream *stream, AVCodecContext *codec_context if ( codec_context->codec_id == CODEC_ID_DVVIDEO ) { AVRational ar = -// #if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(21<<8)+0) -// stream->sample_aspect_ratio; -// #else +#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(21<<8)+0) + stream->sample_aspect_ratio; +#else codec_context->sample_aspect_ratio; -// #endif +#endif // Override FFmpeg's notion of DV aspect ratios, which are // based upon a width of 704. Since we do not have a normaliser // that crops (nor is cropping 720 wide ITU-R 601 video always desirable) -- 1.7.4.4