diff options
| author | James Almer <jamrial@gmail.com> | 2016-08-06 13:31:12 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2016-08-06 13:31:12 -0300 |
| commit | 61da882cea4579658e8d01e24b8cb71c98df2b94 (patch) | |
| tree | 3678708944f57b1e988f7ca640dbfae77744f42e /libavutil/tests/.gitignore | |
| parent | 2ce985c049bccec6ca625ab9944f54f132499d54 (diff) | |
| parent | 90944ee3ab79081845ea1bd97eea475031ce0842 (diff) | |
| download | ffmpeg-61da882cea4579658e8d01e24b8cb71c98df2b94.tar.gz | |
Merge commit '90944ee3ab79081845ea1bd97eea475031ce0842'
* commit '90944ee3ab79081845ea1bd97eea475031ce0842':
avconv: refactor selecting an encoder
Conflicts:
ffmpeg.c
ffmpeg_opt.c
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavutil/tests/.gitignore')
0 files changed, 0 insertions, 0 deletions