Merge branch 'lags-rac' into lagarith
commita61e01561946fd4569959b257ac988e1e34835d6
authorNathan Caldwell <saintdev@gmail.com>
Wed, 23 Sep 2009 05:14:14 +0000 (22 23:14 -0600)
committerNathan Caldwell <saintdev@gmail.com>
Wed, 23 Sep 2009 05:14:14 +0000 (22 23:14 -0600)
treedb3b3c857e1623a13e5c9a7b64575bc3825f6323
parentafdaaa3e226e858ea0a64757b348b7971f75df39
parent7380715ca2dd87d6a7cb7883256ef9088e73feab
Merge branch 'lags-rac' into lagarith

Conflicts:
Changelog
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h