mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-10-02 17:12:49 +02:00
reverting 1.66 -> 1.67 change
Originally committed as revision 4096 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
5b225466ea
commit
de39cdf542
@ -1817,10 +1817,11 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt)
|
|||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
fprintf(stderr, "sc[ffid %d]->sample_size = %d\n", sc->ffindex, sc->sample_size);
|
fprintf(stderr, "sc[ffid %d]->sample_size = %d\n", sc->ffindex, sc->sample_size);
|
||||||
#endif
|
#endif
|
||||||
// sample_size is not always correct for audio. Quicktime ignores this value and
|
//size = sc->sample_sizes[sc->current_sample];
|
||||||
// computes it differently.
|
// that ain't working...
|
||||||
if(s->streams[sc->ffindex]->codec.codec_type == CODEC_TYPE_VIDEO)
|
//size = (sc->sample_size)?sc->sample_size:sc->sample_sizes[sc->current_sample];
|
||||||
size = sc->sample_size?sc->sample_size:sc->sample_sizes[sc->current_sample];
|
size = (sc->sample_size > 1)?sc->sample_size:sc->sample_sizes[sc->current_sample];
|
||||||
|
|
||||||
sc->current_sample++;
|
sc->current_sample++;
|
||||||
sc->left_in_chunk--;
|
sc->left_in_chunk--;
|
||||||
|
|
||||||
@ -1906,8 +1907,7 @@ again:
|
|||||||
|
|
||||||
#ifdef MOV_SPLIT_CHUNKS
|
#ifdef MOV_SPLIT_CHUNKS
|
||||||
/* split chunks into samples */
|
/* split chunks into samples */
|
||||||
if (s->streams[sc->ffindex]->codec.codec_type == CODEC_TYPE_VIDEO) {
|
if (sc->sample_size == 0) {
|
||||||
// This does not support split audio, as the sample_size is often not correct
|
|
||||||
idx = sc->sample_to_chunk_index;
|
idx = sc->sample_to_chunk_index;
|
||||||
if ((idx + 1 < sc->sample_to_chunk_sz)
|
if ((idx + 1 < sc->sample_to_chunk_sz)
|
||||||
&& (sc->next_chunk >= sc->sample_to_chunk[idx + 1].first))
|
&& (sc->next_chunk >= sc->sample_to_chunk[idx + 1].first))
|
||||||
@ -1917,7 +1917,7 @@ again:
|
|||||||
mov->partial = sc;
|
mov->partial = sc;
|
||||||
/* we'll have to get those samples before next chunk */
|
/* we'll have to get those samples before next chunk */
|
||||||
sc->left_in_chunk = sc->sample_to_chunk[idx].count - 1;
|
sc->left_in_chunk = sc->sample_to_chunk[idx].count - 1;
|
||||||
size = sc->sample_size?sc->sample_size:sc->sample_sizes[sc->current_sample];
|
size = (sc->sample_size > 1)?sc->sample_size:sc->sample_sizes[sc->current_sample];
|
||||||
}
|
}
|
||||||
|
|
||||||
sc->current_sample++;
|
sc->current_sample++;
|
||||||
|
Loading…
Reference in New Issue
Block a user