diff options
| author | James Almer <jamrial@gmail.com> | 2016-09-28 12:59:07 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2016-09-28 12:59:07 -0300 |
| commit | 3597d32e88c8e0c6e6f25fe73a9ebd235c879c2b (patch) | |
| tree | 9fa64c178882d5e166cad664f5461fbd56d2158a /libavformat/mmf.c | |
| parent | df2ae8f3f0a8ce9d9aefa5efb664928a783759ec (diff) | |
| parent | 6ed0f70f97c882813199b3bafd724ceeb43659de (diff) | |
| download | ffmpeg-3597d32e88c8e0c6e6f25fe73a9ebd235c879c2b.tar.gz | |
Merge commit '6ed0f70f97c882813199b3bafd724ceeb43659de'
* commit '6ed0f70f97c882813199b3bafd724ceeb43659de':
avconv: factor out initializing stream parameters for streamcopy
Conflicts:
ffmpeg.c
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/mmf.c')
0 files changed, 0 insertions, 0 deletions