summaryrefslogtreecommitdiff
path: root/libavcodec/cljrdec.c
Commit message (Expand)AuthorAge
* Merge commit 'def97856de6021965db86c25a732d78689bd6bb0'Michael Niedermayer2015-07-27
|\
| * lavc: AV-prefix all codec capabilitiesVittorio Giovara2015-07-27
* | avcodec/cljrdec: remove unneeded includeMichael Niedermayer2014-07-07
* | Merge commit '373a6dda5422186bc057297342a9e559a564595e'Michael Niedermayer2014-07-06
|/
* cljr: split decoder and encoderNidhi Makhijani2014-07-06