diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-24 17:08:03 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-24 17:08:13 +0000 |
| commit | 259fef86bb91784f31a7e43e0d6d6a2a1d86f41c (patch) | |
| tree | 7cdea83a0a7d2902ecb6d5fe29c5b22c8062016f /libavcodec/sanm.c | |
| parent | e05704bd46b9107af25204dff47bd8b034868ae4 (diff) | |
| parent | c15f6098b1b25689dd5e86aeb5ce69bc12efe1e1 (diff) | |
| download | ffmpeg-259fef86bb91784f31a7e43e0d6d6a2a1d86f41c.tar.gz | |
Merge commit 'c15f6098b1b25689dd5e86aeb5ce69bc12efe1e1'
* commit 'c15f6098b1b25689dd5e86aeb5ce69bc12efe1e1':
avconv: pass the hw context from filters to the encoder
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/sanm.c')
0 files changed, 0 insertions, 0 deletions