diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-26 14:04:03 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-26 14:04:48 +0100 |
| commit | b5c10c4c9274b06a7bd6f6e1f0f4c129aa6e892c (patch) | |
| tree | 22838221c1d4106d9817720d0799ff03f627a0ea /libavfilter/af_aresample.c | |
| parent | 8e73574d4f176d166f08959f6c84e6bc3ffef79c (diff) | |
| parent | 52ec149fbee57b6ca817049c9706212a0774a32c (diff) | |
| download | ffmpeg-b5c10c4c9274b06a7bd6f6e1f0f4c129aa6e892c.tar.gz | |
Merge commit '52ec149fbee57b6ca817049c9706212a0774a32c'
* commit '52ec149fbee57b6ca817049c9706212a0774a32c':
h2645_parse: change the AVCodecContext* parameter to void*
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavfilter/af_aresample.c')
0 files changed, 0 insertions, 0 deletions