diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-26 13:57:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-26 13:59:28 +0200 |
| commit | b32a6da100a55f35b7dcb9577270b48d2fff4ef9 (patch) | |
| tree | d50f6c010f6c06804cb3f0ca519f79edf7ed80e8 /libavformat/tty.c | |
| parent | e299aa78d955aec21f46748a401dfbd313dd79e9 (diff) | |
| parent | 0b5af5cf1224add1769b1094b9924ecf10de3d7d (diff) | |
| download | ffmpeg-b32a6da100a55f35b7dcb9577270b48d2fff4ef9.tar.gz | |
Merge commit '0b5af5cf1224add1769b1094b9924ecf10de3d7d'
* commit '0b5af5cf1224add1769b1094b9924ecf10de3d7d':
mov: Refactor multiple stsd skipping in mov_mov_skip_multiple_stsd
Conflicts:
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/tty.c')
0 files changed, 0 insertions, 0 deletions