diff options
author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-27 18:29:21 +0000 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-27 18:29:21 +0000 |
commit | 949d6dd51ce17c6ad62d257022ad9a75bc4cba73 (patch) | |
tree | 5ff3bf07bab27a6243f40750bd9c2346e62c27e3 /libavformat/amr.c | |
parent | d97a6193c323a2da96fa470c5f08d4f70f9636c6 (diff) | |
parent | 09f4822e4eaf61513b9092414450f3ae920ccd9d (diff) | |
download | ffmpeg-949d6dd51ce17c6ad62d257022ad9a75bc4cba73.tar.gz |
Merge commit '09f4822e4eaf61513b9092414450f3ae920ccd9d'
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavformat/amr.c')
0 files changed, 0 insertions, 0 deletions