diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-26 01:52:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-26 02:23:56 +0100 |
| commit | 3c5fe5b52758225e58fec917cc29281d6025aa67 (patch) | |
| tree | d7484edfa989ffc33744cbbf11960e803f677f2b /libavformat/isom.h | |
| parent | 01e5e97026cf0b344abafca22b0336a2c58b2a33 (diff) | |
| parent | d78bb1a4b2a3a415b68e4e6dd448779eccec64e3 (diff) | |
| download | ffmpeg-3c5fe5b52758225e58fec917cc29281d6025aa67.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (22 commits)
wma: Clip WMA1 and WMA2 frame length to 11 bits.
movenc: Don't require frame_size to be set for modes other than mov
doc: Update APIchanges with info on muxer flushing
movenc: Reindent a block
tools: Remove some unnecessary #undefs.
rv20: prevent calling ff_h263_decode_mba() with unset height/width
tools: K&R reformatting cosmetics
Ignore generated aviocat and ismindex tools.
build: Automatically include architecture-specific library Makefile snippets.
indeo5: prevent null pointer dereference on broken files
pktdumper: Use usleep instead of sleep
cosmetics: Remove some unnecessary block braces.
Drop unnecessary prefix from *sink* variable and struct names.
Add a tool for creating smooth streaming manifests
movdec: Calculate an average bit rate for fragmented streams, too
movenc: Write the sample rate instead of time scale in the stsd atom
movenc: Add a separate ismv/isma (smooth streaming) muxer
movenc: Allow the caller to decide on fragmentation
libavformat: Add a flag for muxers that support write_packet(NULL) for flushing
movenc: Add support for writing fragmented mov files
...
Conflicts:
Changelog
cmdutils.c
cmdutils.h
doc/APIchanges
ffmpeg.c
ffplay.c
libavfilter/Makefile
libavformat/Makefile
libavformat/avformat.h
libavformat/movenc.c
libavformat/movenc.h
libavformat/version.h
tools/graph2dot.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/isom.h')
| -rw-r--r-- | libavformat/isom.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/isom.h b/libavformat/isom.h index 9a2847dec1..da2b74a329 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -127,6 +127,7 @@ typedef struct MOVStreamContext { int dts_shift; ///< dts shift when ctts is negative uint32_t palette[256]; int has_palette; + int64_t data_size; } MOVStreamContext; typedef struct MOVContext { |