diff options
| author | Michael Niedermayer <[email protected]> | 2015-02-03 23:49:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2015-02-03 23:49:14 +0100 |
| commit | bd12634d6b83e196515c52ccaa9b7513c1023b6f (patch) | |
| tree | f8bf3873887649509ab0660dea8ff2436cfd8ecb /libavformat/r3d.c | |
| parent | 1dc1c4e7a82edb13420f064890fbde3751ca18c9 (diff) | |
| parent | ec524ed12aa1aeb37125203f1adf5aa10dfcb0de (diff) | |
Merge commit 'ec524ed12aa1aeb37125203f1adf5aa10dfcb0de'
* commit 'ec524ed12aa1aeb37125203f1adf5aa10dfcb0de':
tta: Fix framepos and start_offset types
Conflicts:
libavformat/tta.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/r3d.c')
0 files changed, 0 insertions, 0 deletions