diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-31 01:41:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-31 01:44:13 +0200 |
| commit | 36d37edf0189985bb6320737cff6e79431dbdf6d (patch) | |
| tree | fed4aeb3ffa263894816cc62061f9f1e7c7b64a8 /libavutil/file_open.c | |
| parent | 8e8276e0bc50560cf8c057d12af2435f89d7f386 (diff) | |
| parent | 9bd4a9f4eec8c8843b54126253bb9d77af95bbb3 (diff) | |
| download | ffmpeg-36d37edf0189985bb6320737cff6e79431dbdf6d.tar.gz | |
Merge commit '9bd4a9f4eec8c8843b54126253bb9d77af95bbb3'
* commit '9bd4a9f4eec8c8843b54126253bb9d77af95bbb3':
isom: Simplify mov_rewrite_dvd_sub_extradata()
Conflicts:
libavformat/isom.c
See: f6f3c85c0eff54cebc3a45caa7a1e0454b5c9ff8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/file_open.c')
0 files changed, 0 insertions, 0 deletions