From: Martin Storsjö <martin@martin.st>
Date: Fri, 20 Jan 2012 18:48:19 +0000 (+0200)
Subject: movenc: Reorder entries in the MOVIentry struct, for tigheter packing
X-Git-Tag: android-x86-4.4-r1~8529^2~3693
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5d95112d926760046bc0b07aeda5cfc766ba54a6;p=android-x86%2Fexternal-ffmpeg.git

movenc: Reorder entries in the MOVIentry struct, for tigheter packing

Originally, sizeof(struct MOVIentry) was 48, after the reordering,
it is 40 in my build configuration.

When writing really long mov/mp4 files, this can make a difference
- this saves a bit over 2 MB of memory per hour of video (down to
10.3 MB per hour from 12.3 MB per hour initially) for a video with
75 packets per second - 25 fps + 50 audio packets (which is the
case for AMR audio).

Signed-off-by: Martin Storsjö <martin@martin.st>
---

diff --git a/libavformat/movenc.h b/libavformat/movenc.h
index 5ca5631c5a..5595ac71a8 100644
--- a/libavformat/movenc.h
+++ b/libavformat/movenc.h
@@ -40,12 +40,12 @@
 #define MODE_IPOD 0x20
 
 typedef struct MOVIentry {
-    unsigned int size;
     uint64_t     pos;
+    int64_t      dts;
+    unsigned int size;
     unsigned int samplesInChunk;
     unsigned int entries;
     int          cts;
-    int64_t      dts;
 #define MOV_SYNC_SAMPLE         0x0001
 #define MOV_PARTIAL_SYNC_SAMPLE 0x0002
     uint32_t     flags;