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)
* commit 'd621b2f795684f7119057f986066060adbe84220':
  lavf: Raw G.729 demuxer

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

Simple merge