diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-31 02:08:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-31 02:10:01 +0200 |
| commit | 46ff8108f6b4bb3c74c476ddcbb4c92ad928a202 (patch) | |
| tree | 8385279cc32ef36e1164c9a96688197faaa24061 /libavutil/file_open.c | |
| parent | 1ffbaa88c92b53e72dc4628e35e1f7c39819f31e (diff) | |
| parent | 12789d96361ed8e9804bfbb9db31ea4110e75c58 (diff) | |
| download | ffmpeg-46ff8108f6b4bb3c74c476ddcbb4c92ad928a202.tar.gz | |
Merge commit '12789d96361ed8e9804bfbb9db31ea4110e75c58'
* commit '12789d96361ed8e9804bfbb9db31ea4110e75c58':
mov: call mov_rewrite_dvd_sub_extradata() after parsing dimensions from tkhd
Conflicts:
libavformat/isom.c
See: e21235f9b9e264111279847617bb7bdaa734b11a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/file_open.c')
0 files changed, 0 insertions, 0 deletions