diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-21 23:11:27 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-21 23:11:27 +0100 |
| commit | b5a69e79c579e6e15e2019ffd34ef0e09aeab586 (patch) | |
| tree | bc6b0aa0776ca51a9b8a4800a7f464866221821f /libavformat/movenc.h | |
| parent | 9e53f62be1a171eaf9620958c225d42cf5142a30 (diff) | |
| parent | ad7beb2cac1563e87171a4d044a6d526527d81d9 (diff) | |
| download | ffmpeg-b5a69e79c579e6e15e2019ffd34ef0e09aeab586.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtpdec: Use our own SSRC in the SDES field when sending RRs
Finalize changelog for 0.8 Release
Prepare for 0.8 Release
threads: change the default for threads back to 1
threads: update slice_count and slice_offset from user context
aviocat: Remove useless includes
doc/APIChanges: fill in missing dates and hashes
Revert "avserver: fix build after the next bump."
mpegaudiodec: switch error detection check to AV_EF_BUFFER
lavf: rename fer option and document resulting (f_)err_detect options
lavc: rename err_filter option to err_detect and document it
mpegvideo: fix invalid memory access for small video dimensions
movenc: Reorder entries in the MOVIentry struct, for tigheter packing
rtsp: Remove extern declarations for variables that don't exist
aviocat: Flush the output before closing
Conflicts:
Changelog
RELEASE
libavcodec/mpegaudiodec.c
libavcodec/pthread.c
libavformat/options.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/movenc.h')
| -rw-r--r-- | libavformat/movenc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/movenc.h b/libavformat/movenc.h index f6c95adea3..ac6573b821 100644 --- a/libavformat/movenc.h +++ b/libavformat/movenc.h @@ -40,13 +40,13 @@ #define MODE_IPOD 0x20 typedef struct MOVIentry { - unsigned int size; uint64_t pos; + int64_t dts; + unsigned int size; unsigned int samplesInChunk; unsigned int chunkNum; ///< Chunk number if the current entry is a chunk start otherwise 0 unsigned int entries; int cts; - int64_t dts; #define MOV_SYNC_SAMPLE 0x0001 #define MOV_PARTIAL_SYNC_SAMPLE 0x0002 uint32_t flags; |