Merge branch 'master' into ordered_chapters
commitb3df49311ebcaf3a0bede151b1f630854c8ff55d
authorAnton Khirnov <wyskas@gmail.com>
Wed, 28 Jan 2009 17:53:55 +0000 (28 18:53 +0100)
committerAnton Khirnov <wyskas@gmail.com>
Wed, 28 Jan 2009 17:53:55 +0000 (28 18:53 +0100)
tree62f2823b59337a0013a8c28539ff889a1b462ec9
parent414c50c160ddc5d65cc1351b4c34f89c7e14edc4
parentd80920117de35886ba333b8ea8f96149f3a5afd1
Merge branch 'master' into ordered_chapters
libavformat/avformat.h