diff options
author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-27 18:27:19 +0000 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-27 18:27:19 +0000 |
commit | d97a6193c323a2da96fa470c5f08d4f70f9636c6 (patch) | |
tree | a91d8318a1d82361c522c88e98cfaafbcb23a490 /libavformat/amr.c | |
parent | ea2df330525c8bca383e5ad9ecabbd9ec3d36c67 (diff) | |
parent | 03ef89faf23c4851848208c9fe004cd9ef690cec (diff) | |
download | ffmpeg-d97a6193c323a2da96fa470c5f08d4f70f9636c6.tar.gz |
Merge commit '03ef89faf23c4851848208c9fe004cd9ef690cec'
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavformat/amr.c')
0 files changed, 0 insertions, 0 deletions