diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-24 16:39:01 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-24 16:39:20 +0000 |
| commit | 14f942b3598273e30556ca292b963b832b09015c (patch) | |
| tree | ea852976be3a8b8d0cd3d57bc1beb918b89991d0 /libavcodec/adpcm.h | |
| parent | 10424024a16a7646169b9c9008c5f7b77cbc2211 (diff) | |
| parent | 1bf34134612e509fa68c70dfff418c6022459259 (diff) | |
| download | ffmpeg-14f942b3598273e30556ca292b963b832b09015c.tar.gz | |
Merge commit '1bf34134612e509fa68c70dfff418c6022459259'
This commit is a no-op.
* commit '1bf34134612e509fa68c70dfff418c6022459259':
avconv: use the new buffersrc parameters API
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/adpcm.h')
0 files changed, 0 insertions, 0 deletions