diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-24 20:50:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-24 20:51:22 +0200 |
| commit | 41070923490a678911435fb1d65bba04c6bf2a5e (patch) | |
| tree | 680512128bfa4ae478e4c7a0c34b5810c34c8bc2 /libavformat/file_open.c | |
| parent | ffd9d60201a7f226ad3dad011e08e7ff10595036 (diff) | |
| parent | ded5957d75def70d2f1fc1c1eae079230004974b (diff) | |
| download | ffmpeg-41070923490a678911435fb1d65bba04c6bf2a5e.tar.gz | |
Merge commit 'ded5957d75def70d2f1fc1c1eae079230004974b'
* commit 'ded5957d75def70d2f1fc1c1eae079230004974b':
segafilm: Remove deplanarization hack
Conflicts:
libavformat/segafilm.c
libavformat/version.h
See: 42b8f5fba1f067c55231791039283e41b5167247
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/file_open.c')
0 files changed, 0 insertions, 0 deletions