Mercurial > libavformat.hg
comparison utils.c @ 406:ea22a438ca79 libavformat
fix obnoxious ogg_packet passing from encoder to muxer
| author | michael |
|---|---|
| date | Sun, 04 Apr 2004 14:39:20 +0000 |
| parents | 6579fe3ade40 |
| children | b6949d80b7a9 |
comparison
equal
deleted
inserted
replaced
| 405:04d7dda7ccd5 | 406:ea22a438ca79 |
|---|---|
| 1705 | 1705 |
| 1706 /* update pts */ | 1706 /* update pts */ |
| 1707 switch (st->codec.codec_type) { | 1707 switch (st->codec.codec_type) { |
| 1708 case CODEC_TYPE_AUDIO: | 1708 case CODEC_TYPE_AUDIO: |
| 1709 frame_size = get_audio_frame_size(&st->codec, size); | 1709 frame_size = get_audio_frame_size(&st->codec, size); |
| 1710 if (frame_size >= 0) { | 1710 |
| 1711 /* note, we skip the initial 0-size packets as they are most likely equal to the encoder delay, | |
| 1712 but it would be better if we had the real timestamps from the encoder */ | |
| 1713 // av_log(s, AV_LOG_DEBUG, "%d %lld %lld\n", size, st->pts.num, st->pts.val); | |
| 1714 if (frame_size >= 0 && (size || st->pts.num!=st->pts.den>>1 || st->pts.val)) { | |
| 1711 av_frac_add(&st->pts, | 1715 av_frac_add(&st->pts, |
| 1712 (int64_t)s->pts_den * frame_size); | 1716 (int64_t)s->pts_den * frame_size); |
| 1713 } | 1717 } |
| 1714 break; | 1718 break; |
| 1715 case CODEC_TYPE_VIDEO: | 1719 case CODEC_TYPE_VIDEO: |
| 1898 "%H%M%S", | 1902 "%H%M%S", |
| 1899 }; | 1903 }; |
| 1900 const char *q; | 1904 const char *q; |
| 1901 int is_utc, len; | 1905 int is_utc, len; |
| 1902 char lastch; | 1906 char lastch; |
| 1907 | |
| 1908 #undef time | |
| 1903 time_t now = time(0); | 1909 time_t now = time(0); |
| 1904 | 1910 |
| 1905 len = strlen(datestr); | 1911 len = strlen(datestr); |
| 1906 if (len > 0) | 1912 if (len > 0) |
| 1907 lastch = datestr[len - 1]; | 1913 lastch = datestr[len - 1]; |
