diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-26 13:28:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-26 13:28:04 +0200 |
| commit | e299aa78d955aec21f46748a401dfbd313dd79e9 (patch) | |
| tree | 93eee9a25df40f3b955e7bec183cdcf79909a2f0 /libavutil/file_open.c | |
| parent | 80e05994025ec40076e40388fcd9361a5f64a519 (diff) | |
| parent | 08504380ddf25d6905e189e9bf52e7a4c771a415 (diff) | |
| download | ffmpeg-e299aa78d955aec21f46748a401dfbd313dd79e9.tar.gz | |
Merge commit '08504380ddf25d6905e189e9bf52e7a4c771a415'
* commit '08504380ddf25d6905e189e9bf52e7a4c771a415':
mov: Refactor codec specific final steps in mov_finalize_stsd_codec
Conflicts:
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/file_open.c')
0 files changed, 0 insertions, 0 deletions