diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-03 14:54:35 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-03 14:54:43 +0400 |
commit | 3da711119340a983c95015eeb4cffc55d6a9f361 (patch) | |
tree | 4dd7a9578c11fa9fa165674d17dc53651d40cd17 /libavformat/movenc.h | |
parent | e5cdf9c03b1ef0913dad117b0e5d343a525f6d10 (diff) | |
parent | 9683e37cd5c556c9974e78fba344ede4f33afd18 (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
movenc: Change the track struct name to match the typedef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/movenc.h')
-rw-r--r-- | libavformat/movenc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/movenc.h b/libavformat/movenc.h index ff8f76e4af..2c57834d10 100644 --- a/libavformat/movenc.h +++ b/libavformat/movenc.h @@ -75,7 +75,7 @@ typedef struct MOVFragmentInfo { int64_t tfrf_offset; } MOVFragmentInfo; -typedef struct MOVIndex { +typedef struct MOVTrack { int mode; int entry; unsigned timescale; |