git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ea28918
)
segafilm: use the sample rate as the time base for audio streams
author
Justin Ruggles
<justin.ruggles@gmail.com>
Wed, 11 Jan 2012 16:07:40 +0000
(11:07 -0500)
committer
Justin Ruggles
<justin.ruggles@gmail.com>
Sat, 3 Mar 2012 22:03:27 +0000
(17:03 -0500)
libavformat/segafilm.c
patch
|
blob
|
history
diff --git
a/libavformat/segafilm.c
b/libavformat/segafilm.c
index
83ba4f0
..
23cb3ed
100644
(file)
--- a/
libavformat/segafilm.c
+++ b/
libavformat/segafilm.c
@@
-196,8
+196,13
@@
static int film_read_header(AVFormatContext *s)
if (!film->sample_table)
return AVERROR(ENOMEM);
if (!film->sample_table)
return AVERROR(ENOMEM);
- for(i=0; i<s->nb_streams; i++)
- avpriv_set_pts_info(s->streams[i], 33, 1, film->base_clock);
+ for (i = 0; i < s->nb_streams; i++) {
+ st = s->streams[i];
+ if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
+ avpriv_set_pts_info(st, 33, 1, film->base_clock);
+ else
+ avpriv_set_pts_info(st, 64, 1, film->audio_samplerate);
+ }
audio_frame_counter = 0;
for (i = 0; i < film->sample_count; i++) {
audio_frame_counter = 0;
for (i = 0; i < film->sample_count; i++) {
@@
-212,8
+217,6
@@
static int film_read_header(AVFormatContext *s)
if (AV_RB32(&scratch[8]) == 0xFFFFFFFF) {
film->sample_table[i].stream = film->audio_stream_index;
film->sample_table[i].pts = audio_frame_counter;
if (AV_RB32(&scratch[8]) == 0xFFFFFFFF) {
film->sample_table[i].stream = film->audio_stream_index;
film->sample_table[i].pts = audio_frame_counter;
- film->sample_table[i].pts *= film->base_clock;
- film->sample_table[i].pts /= film->audio_samplerate;
if (film->audio_type == CODEC_ID_ADPCM_ADX)
audio_frame_counter += (film->sample_table[i].sample_size * 32 /
if (film->audio_type == CODEC_ID_ADPCM_ADX)
audio_frame_counter += (film->sample_table[i].sample_size * 32 /