ffmpeg-cvslog

Download

ffmpeg-cvslog@ffmpeg.org

September 2010

17 participants
332 discussions

r25015 - in trunk: libavcodec/ansi.c libavcore/avcore.h libavcore/parseutils.h
by subversion＠mplayerhq.hu 01 Sep '10

01 Sep '10

Author: diego Date: Wed Sep 1 04:12:03 2010 New Revision: 25015 Log: Use quotes instead of angle brackets for local #includes. Modified: trunk/libavcodec/ansi.c trunk/libavcore/avcore.h trunk/libavcore/parseutils.h Modified: trunk/libavcodec/ansi.c ============================================================================== --- trunk/libavcodec/ansi.c Wed Sep 1 02:04:47 2010 (r25014) +++ trunk/libavcodec/ansi.c Wed Sep 1 04:12:03 2010 (r25015) @@ -24,9 +24,9 @@ * ASCII/ANSI art decoder */ +#include "libavutil/lfg.h" #include "avcodec.h" #include "cga_data.h" -#include <libavutil/lfg.h> #define ATTR_BOLD 0x01 /**< Bold/Bright-foreground (mode 1) */ #define ATTR_FAINT 0x02 /**< Faint (mode 2) */ Modified: trunk/libavcore/avcore.h ============================================================================== --- trunk/libavcore/avcore.h Wed Sep 1 02:04:47 2010 (r25014) +++ trunk/libavcore/avcore.h Wed Sep 1 04:12:03 2010 (r25015) @@ -24,7 +24,7 @@ * shared media utilities for the libav* libraries */ -#include <libavutil/avutil.h> +#include "libavutil/avutil.h" #define LIBAVCORE_VERSION_MAJOR 0 #define LIBAVCORE_VERSION_MINOR 6 Modified: trunk/libavcore/parseutils.h ============================================================================== --- trunk/libavcore/parseutils.h Wed Sep 1 02:04:47 2010 (r25014) +++ trunk/libavcore/parseutils.h Wed Sep 1 04:12:03 2010 (r25015) @@ -19,7 +19,7 @@ #ifndef AVCORE_PARSEUTILS_H #define AVCORE_PARSEUTILS_H -#include <libavutil/rational.h> +#include "libavutil/rational.h" /** * @file

1 0

r25014 - trunk/libavformat/gxfenc.c
by subversion＠mplayerhq.hu 01 Sep '10

01 Sep '10

Author: bcoudurier Date: Wed Sep 1 02:04:47 2010 New Revision: 25014 Log: gxf muxer only accepts pal or ntsc resolutions currently, so fail if resolution is something else Modified: trunk/libavformat/gxfenc.c Modified: trunk/libavformat/gxfenc.c ============================================================================== --- trunk/libavformat/gxfenc.c Tue Aug 31 22:07:38 2010 (r25013) +++ trunk/libavformat/gxfenc.c Wed Sep 1 02:04:47 2010 (r25014) @@ -678,12 +678,16 @@ static int gxf_write_header(AVFormatCont sc->sample_rate = 60; gxf->flags |= 0x00000080; gxf->time_base = (AVRational){ 1001, 60000 }; - } else { /* assume PAL */ + } else if (st->codec->height == 576 || st->codec->height == 608) { /* PAL or PAL+VBI */ sc->frame_rate_index = 6; sc->media_type++; sc->sample_rate = 50; gxf->flags |= 0x00000040; gxf->time_base = (AVRational){ 1, 50 }; + } else { + av_log(s, AV_LOG_ERROR, "unsupported video resolution, " + "gxf muxer only accepts PAL or NTSC resolutions currently\n"); + return -1; } av_set_pts_info(st, 64, gxf->time_base.num, gxf->time_base.den); if (gxf_find_lines_index(st) < 0)

1 0

Jump to page: