virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

Merge commit 'c53b5dda352452e79a9e962cd4c74c813186d9ed'

Browse Source 
* commit 'c53b5dda352452e79a9e962cd4c74c813186d9ed':
  asfdec: replace magic constant with DATA_HEADER_SIZE

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-09-20 11:06:09 +02:00
commit c6526620a9
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/asfenc.c
View File

@ -183,6 +183,8 @@
1 - /* Payload Flags */ \ 1 - /* Payload Flags */ \
2 * PAYLOAD_HEADER_SIZE_MULTIPLE_PAYLOADS) 2 * PAYLOAD_HEADER_SIZE_MULTIPLE_PAYLOADS)
#define DATA_HEADER_SIZE 50
typedef struct { typedef struct {
uint32_t seqno; uint32_t seqno;
int is_streamed; int is_streamed;
@ -520,14 +522,14 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size,
cur_pos = avio_tell(pb); cur_pos = avio_tell(pb);
header_size = cur_pos - header_offset; header_size = cur_pos - header_offset;
if (asf->is_streamed) { if (asf->is_streamed) {
header_size += 8 + 30 + 50; header_size += 8 + 30 + DATA_HEADER_SIZE;
avio_seek(pb, header_offset - 10 - 30, SEEK_SET); avio_seek(pb, header_offset - 10 - 30, SEEK_SET);
avio_wl16(pb, header_size); avio_wl16(pb, header_size);
avio_seek(pb, header_offset - 2 - 30, SEEK_SET); avio_seek(pb, header_offset - 2 - 30, SEEK_SET);
avio_wl16(pb, header_size); avio_wl16(pb, header_size);
header_size -= 8 + 30 + 50; header_size -= 8 + 30 + DATA_HEADER_SIZE;
} }
header_size += 24 + 6; header_size += 24 + 6;
avio_seek(pb, header_offset - 14, SEEK_SET); avio_seek(pb, header_offset - 14, SEEK_SET);
@ -556,10 +558,10 @@ static int asf_write_header(AVFormatContext *s)
asf->nb_index_memory_alloc = ASF_INDEX_BLOCK; asf->nb_index_memory_alloc = ASF_INDEX_BLOCK;
asf->maximum_packet = 0; asf->maximum_packet = 0;
/* the data-chunk-size has to be 50, which is data_size - asf->data_offset /* the data-chunk-size has to be 50 (DATA_HEADER_SIZE), which is
* at the moment this function is done. It is needed to use asf as * data_size - asf->data_offset at the moment this function is done.
* streamable format. */ * It is needed to use asf as a streamable format. */
if (asf_write_header1(s, 0, 50) < 0) { if (asf_write_header1(s, 0, DATA_HEADER_SIZE) < 0) {
//av_free(asf); //av_free(asf);
return -1; return -1;
} }