Merge svn changes up to r28368
commit03aa64687fc109c5f2346a3c191b70698b333509
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Sun, 25 Jan 2009 23:57:38 +0000 (26 01:57 +0200)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Sun, 25 Jan 2009 23:57:41 +0000 (26 01:57 +0200)
tree03cfac7d56be327094c2bfcaf115691e75bf611e
parentdd888b05ff3af1c6c35582e75bedae687d38fc66
parent7034529d9ae9b593ebbac187e983a1b7bde5be83
Merge svn changes up to r28368

Fixes af_format.c compilation bug exposed by latest FFmpeg change.