diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-26 13:04:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-26 13:07:13 +0200 |
| commit | bc6370b622276c5603d6e32e3939f8b7fb3a4b35 (patch) | |
| tree | 9635b752bdf2eb6ca6f61a8a129412f61251ef2e /libavformat/avi.h | |
| parent | f5a0c205d91d049a663f704dda606a5562055efb (diff) | |
| parent | a3b53ff062eaccdaa28964899c63520ef2978c2e (diff) | |
| download | ffmpeg-bc6370b622276c5603d6e32e3939f8b7fb3a4b35.tar.gz | |
Merge commit 'a3b53ff062eaccdaa28964899c63520ef2978c2e'
* commit 'a3b53ff062eaccdaa28964899c63520ef2978c2e':
mov: Refactor video specific parsing in mov_parse_stsd_video
Conflicts:
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avi.h')
0 files changed, 0 insertions, 0 deletions