Merge commit 'd621b2f795684f7119057f986066060adbe84220'
authorClément Bœsch <clement@stupeflix.com>
Thu, 23 Jun 2016 10:26:16 +0000 (12:26 +0200)
committerClément Bœsch <clement@stupeflix.com>
Thu, 23 Jun 2016 10:26:25 +0000 (12:26 +0200)
commit5954730ba35ca223e7ba520ade9d589e158c1ede
tree9aad0ba953eefee2e645d5affffd730d60aaabf3
parent28dac0dc061fa85fe671f43e78059fbc9f1eccac
parentd621b2f795684f7119057f986066060adbe84220
Merge commit 'd621b2f795684f7119057f986066060adbe84220'

* commit 'd621b2f795684f7119057f986066060adbe84220':
  lavf: Raw G.729 demuxer

Merged-by: Clément Bœsch <clement@stupeflix.com>
libavformat/g729dec.c