1 Sep 2010 02:04
r25014 - trunk/libavformat/gxfenc.c
bcoudurier <subversion <at> mplayerhq.hu>
2010-09-01 00:04:47 GMT
2010-09-01 00:04:47 GMT
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)
<at> <at> -678,12 +678,16 <at> <at> 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;
}
(Continue reading)
RSS Feed