[FFmpeg-cvslog] asfdec: replace magic constant with DATA_HEADER_SIZE
Vladimir Pantelic
git at videolan.org
Fri Sep 20 11:14:25 CEST 2013
ffmpeg | branch: master | Vladimir Pantelic <vladoman at gmail.com> | Thu Sep 19 17:50:35 2013 +0200| [c53b5dda352452e79a9e962cd4c74c813186d9ed] | committer: Anton Khirnov
asfdec: replace magic constant with DATA_HEADER_SIZE
Signed-off-by: Vladimir Pantelic <vladoman at gmail.com>
Signed-off-by: Anton Khirnov <anton at khirnov.net>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c53b5dda352452e79a9e962cd4c74c813186d9ed
---
libavformat/asfenc.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/libavformat/asfenc.c b/libavformat/asfenc.c
index 6be285c..e37b6f7 100644
--- a/libavformat/asfenc.c
+++ b/libavformat/asfenc.c
@@ -182,6 +182,8 @@
1 - /* Payload Flags */ \
2 * PAYLOAD_HEADER_SIZE_MULTIPLE_PAYLOADS)
+#define DATA_HEADER_SIZE 50
+
typedef struct {
uint32_t seqno;
int is_streamed;
@@ -517,14 +519,14 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size,
cur_pos = avio_tell(pb);
header_size = cur_pos - header_offset;
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_wl16(pb, header_size);
avio_seek(pb, header_offset - 2 - 30, SEEK_SET);
avio_wl16(pb, header_size);
- header_size -= 8 + 30 + 50;
+ header_size -= 8 + 30 + DATA_HEADER_SIZE;
}
header_size += 24 + 6;
avio_seek(pb, header_offset - 14, SEEK_SET);
@@ -555,10 +557,10 @@ static int asf_write_header(AVFormatContext *s)
asf->nb_index_count = 0;
asf->maximum_packet = 0;
- /* the data-chunk-size has to be 50, which is data_size - asf->data_offset
- * at the moment this function is done. It is needed to use asf as
- * streamable format. */
- if (asf_write_header1(s, 0, 50) < 0) {
+ /* the data-chunk-size has to be 50 (DATA_HEADER_SIZE), which is
+ * data_size - asf->data_offset at the moment this function is done.
+ * It is needed to use asf as a streamable format. */
+ if (asf_write_header1(s, 0, DATA_HEADER_SIZE) < 0) {
//av_free(asf);
return -1;
}
More information about the ffmpeg-cvslog
mailing list