generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'b3b0b35db2f3b61bf2f0f4fa85f5b6267d83c8fe'

Browse Source 
* commit 'b3b0b35db2f3b61bf2f0f4fa85f5b6267d83c8fe':
  movenc: Get rid of a hack for updating the dvc1 atom

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-01-03 04:01:29 +01:00
commit b0ba8a23b6
2 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavformat/movenc.c
View File

@ -721,9 +721,11 @@ static int mov_write_dvc1_structs(MOVTrack *track, uint8_t *buf)
if (track->start_dts == AV_NOPTS_VALUE) { if (track->start_dts == AV_NOPTS_VALUE) {
/* No packets written yet, vc1_info isn't authoritative yet. */ /* No packets written yet, vc1_info isn't authoritative yet. */
/* Assume inline sequence and entry headers. This will be /* Assume inline sequence and entry headers. */
* overwritten at the end if the file is seekable. */
packet_seq = packet_entry = 1; packet_seq = packet_entry = 1;
av_log(NULL, AV_LOG_WARNING,
"moov atom written before any packets, unable to write correct "
"dvc1 atom. Set the delay_moov flag to fix this.\n");
} }
unescaped = av_mallocz(track->vos_len + FF_INPUT_BUFFER_PADDING_SIZE); unescaped = av_mallocz(track->vos_len + FF_INPUT_BUFFER_PADDING_SIZE);
@ -799,7 +801,6 @@ static int mov_write_dvc1_tag(AVIOContext *pb, MOVTrack *track)
avio_wb32(pb, track->vos_len + 8 + sizeof(buf)); avio_wb32(pb, track->vos_len + 8 + sizeof(buf));
ffio_wfourcc(pb, "dvc1"); ffio_wfourcc(pb, "dvc1");
track->vc1_info.struct_offset = avio_tell(pb);
avio_write(pb, buf, sizeof(buf)); avio_write(pb, buf, sizeof(buf));
avio_write(pb, track->vos_data, track->vos_len); avio_write(pb, track->vos_data, track->vos_len);
@ -5167,19 +5168,6 @@ static int mov_write_trailer(AVFormatContext *s)
} }
} }
for (i = 0; i < mov->nb_streams; i++) {
if (mov->flags & FF_MOV_FLAG_FRAGMENT &&
mov->tracks[i].vc1_info.struct_offset && s->pb->seekable) {
int64_t off = avio_tell(pb);
uint8_t buf[7];
if (mov_write_dvc1_structs(&mov->tracks[i], buf) >= 0) {
avio_seek(pb, mov->tracks[i].vc1_info.struct_offset, SEEK_SET);
avio_write(pb, buf, 7);
avio_seek(pb, off, SEEK_SET);
}
}
}
error: error:
mov_free(s); mov_free(s);

1
libavformat/movenc.h
View File

@ -137,7 +137,6 @@ typedef struct MOVTrack {
unsigned frag_info_capacity; unsigned frag_info_capacity;
struct { struct {
int64_t struct_offset;
int first_packet_seq; int first_packet_seq;
int first_packet_entry; int first_packet_entry;
int packet_seq; int packet_seq;