mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-05-28 07:29:14 +00:00
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>
This commit is contained in:
commit
15c6be8c7d
24 changed files with 473 additions and 83 deletions
|
@ -66,8 +66,8 @@ static int mpegaudio_parse(AVCodecParserContext *s1,
|
|||
|
||||
ret = avpriv_mpa_decode_header(avctx, state, &sr, &channels, &frame_size, &bit_rate);
|
||||
if (ret < 4) {
|
||||
if(i > 4)
|
||||
s->header_count= -2;
|
||||
if (i > 4)
|
||||
s->header_count = -2;
|
||||
} else {
|
||||
if((state&SAME_HEADER_MASK) != (s->header&SAME_HEADER_MASK) && s->header)
|
||||
s->header_count= -3;
|
||||
|
@ -75,7 +75,7 @@ static int mpegaudio_parse(AVCodecParserContext *s1,
|
|||
s->header_count++;
|
||||
s->frame_size = ret-4;
|
||||
|
||||
if(s->header_count > 1){
|
||||
if (s->header_count > 1) {
|
||||
avctx->sample_rate= sr;
|
||||
avctx->channels = channels;
|
||||
s1->duration = frame_size;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue