| commit | 60dd3839f86d17390eb685c337658392ae0f25b7 | |
| author | Anton Khirnov <wyskas@gmail.com> | |
| Sat, 12 Sep 2009 08:59:40 +0000 (12 10:59 +0200) | ||
| committer | Anton Khirnov <wyskas@gmail.com> | |
| Sat, 12 Sep 2009 08:59:40 +0000 (12 10:59 +0200) | ||
| tree | c2da3d550559023b361282cc5333ec8cacdb1aa8 | treesnapshot (tar.gz zip) |
| parent | c842764990a59720af96136a93fe9735d694b034 | commitdiff |
| parent | 56957637b1ac91a5ce97ec88768c703ada3b78a3 | commitdiff |
Merge commit 'origin/master' into ordered_chapters
Conflicts:
libavformat/avformat.h
Conflicts:
libavformat/avformat.h