summaryrefslogtreecommitdiff
path: root/libavcodec/cngenc.c
Commit message (Expand)AuthorAge
* Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73'Michael Niedermayer2012-10-31
|\
| * cng: Reindent some incorrectly indented linesMartin Storsjö2012-10-30
* | Merge commit '14f031d7ecfabba0ef02776d4516aa3dcb7c40d8'Michael Niedermayer2012-10-30
|/
* avcodec: Add a RFC 3389 comfort noise codecMartin Storsjö2012-10-29