virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'cehoyos/master'

Browse Source 
* cehoyos/master:
  Allow .y as extension for image2.
  Show stream number when warning about stream without start time.
  Force gif aspect ratio multiplication to 64bit.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-04-05 03:23:43 +02:00
commit 7a5537fd3f
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/gif.c
View File

@ -33,10 +33,11 @@ static int gif_image_write_header(AVFormatContext *s, int width, int height,
{
AVIOContext *pb = s->pb;
AVRational sar = s->streams[0]->codec->sample_aspect_ratio;
int i, aspect = 0;
int i;
int64_t aspect = 0;
if (sar.num > 0 && sar.den > 0) {
aspect = sar.num * 64 / sar.den - 15;
aspect = sar.num * 64LL / sar.den - 15;
if (aspect < 0 || aspect > 255)
aspect = 0;
}

2
libavformat/img2enc.c
View File

@ -194,7 +194,7 @@ AVOutputFormat ff_image2_muxer = {
.long_name = NULL_IF_CONFIG_SMALL("image2 sequence"),
.extensions = "bmp,dpx,jls,jpeg,jpg,ljpg,pam,pbm,pcx,pgm,pgmyuv,png,"
"ppm,sgi,tga,tif,tiff,jp2,j2c,j2k,xwd,sun,ras,rs,im1,im8,im24,"
"sunras,webp,xbm,xface,pix",
"sunras,webp,xbm,xface,pix,y",
.priv_data_size = sizeof(VideoMuxData),
.video_codec = AV_CODEC_ID_MJPEG,
.write_header = write_header,

2
libavformat/utils.c
View File

@ -2451,7 +2451,7 @@ static void estimate_timings_from_pts(AVFormatContext *ic, int64_t old_offset)
st->first_dts == AV_NOPTS_VALUE &&
st->codec->codec_type != AVMEDIA_TYPE_UNKNOWN)
av_log(st->codec, AV_LOG_WARNING,
"start time is not set in estimate_timings_from_pts\n");
"start time for stream %d is not set in estimate_timings_from_pts\n", i);
if (st->parser) {
av_parser_close(st->parser);