diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-17 14:40:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-17 14:40:53 +0200 |
| commit | 694f9ab1ef141cf80de8f81db6955a17606182af (patch) | |
| tree | 8bce92071141b185bcd67abbb0cc1cf9429340b5 /libavcodec/g722.h | |
| parent | 441d5a7084b56fd9874daede2ef90356b3bf9d16 (diff) | |
| parent | f1840b070dd449ad25e1ebbab463f10863a5e0f1 (diff) | |
| download | ffmpeg-694f9ab1ef141cf80de8f81db6955a17606182af.tar.gz | |
Merge commit 'f1840b070dd449ad25e1ebbab463f10863a5e0f1'
* commit 'f1840b070dd449ad25e1ebbab463f10863a5e0f1':
Revert "mov: Double-check that alias path is not an absolute path"
Conflicts:
libavformat/mov.c
See: c9c7263e5820c957598643216c42be9b1c4f2d2b
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/g722.h')
0 files changed, 0 insertions, 0 deletions