diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-04 02:03:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-04 04:26:04 +0100 |
| commit | 15c6be8c7da7b94b5e131396e9a82ab6fe4a6b64 (patch) | |
| tree | 84db7f4851faba26561f846b4f112ef64d01b3ad /libavformat/segafilm.c | |
| parent | f972193a15026a99eb2b08e7913a03f2123663da (diff) | |
| parent | b7beabab4b78cc253d06c0a33f15b8ff79866e85 (diff) | |
| download | ffmpeg-15c6be8c7da7b94b5e131396e9a82ab6fe4a6b64.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
tiertexseq: set correct block_align for audio
tiertexseq: set audio stream start time to 0
voc/avs: Do not change the sample rate mid-stream.
segafilm: use the sample rate as the time base for audio streams
ea: fix audio pts
psx-str: fix audio pts
vqf: set packet duration
tta demuxer: set packet duration
mpegaudio_parser: do not ignore information from the first parsed frame
mpegaudio_parser: be less picky about the start position
thp: set audio packet durations
avcodec: add a Vorbis parser to get packet duration
vorbisdec: read the previous window flag for long windows
lavc: free the output packet when encoding failed or produced no output.
lavc: preserve avpkt->destruct in ff_alloc_packet().
lavc: clarify the meaning of AVCodecContext.frame_number.
mpegts: Pad the packet buffer in handle_packet().
mpegts: Do not call read_sl_header() when no bytes remain in the buffer.
Conflicts:
libavcodec/mpegaudio_parser.c
libavcodec/version.h
libavformat/mpegts.c
tests/ref/fate/pva-demux
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/segafilm.c')
| -rw-r--r-- | libavformat/segafilm.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libavformat/segafilm.c b/libavformat/segafilm.c index 210dedad48..c0a5e0f81e 100644 --- a/libavformat/segafilm.c +++ b/libavformat/segafilm.c @@ -197,8 +197,13 @@ static int film_read_header(AVFormatContext *s) 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++) { @@ -213,8 +218,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; - 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 / |