| commit | c842764990a59720af96136a93fe9735d694b034 | |
| author | Anton Khirnov <wyskas@gmail.com> | |
| Mon, 11 May 2009 10:39:30 +0000 (11 12:39 +0200) | ||
| committer | Anton Khirnov <wyskas@gmail.com> | |
| Mon, 11 May 2009 10:39:30 +0000 (11 12:39 +0200) | ||
| tree | d46122834e408adbcc6061e006dc7fcccae72a42 | treesnapshot (tar.gz zip) |
| parent | ef775533ad75e82425fe50e24a87a530394e94a2 | commitdiff |
| parent | 244778bc4218635b6e92e763ac754ea23a795316 | commitdiff |
Merge branch 'master' into ordered_chapters
Conflicts:
libavformat/file.c
Conflicts:
libavformat/file.c
| libavformat/avformat.h | diff1 | diff2 | blobhistory |
| libavformat/file.c | diff1 | diff2 | blobhistory |
| libavformat/matroskadec.c | diff1 | diff2 | blobhistory |
| libavformat/utils.c | diff1 | diff2 | blobhistory |