diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-23 14:26:27 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-23 14:31:15 +0100 |
| commit | 62e10c375968d9cbbe2a0bc321e00eef52d32917 (patch) | |
| tree | 8c8a3a4b025d3cf54abb44a3ab988c58c2c9e615 /libavutil/log.c | |
| parent | 94194bdcd7bfc2137ccd13e5c149567b9a917f4f (diff) | |
| parent | 07fd0a22192805d56c635eb294dc26b0a54ae325 (diff) | |
| download | ffmpeg-62e10c375968d9cbbe2a0bc321e00eef52d32917.tar.gz | |
Merge commit '07fd0a22192805d56c635eb294dc26b0a54ae325'
* commit '07fd0a22192805d56c635eb294dc26b0a54ae325':
avconv: add infrastructure for using hwaccels
Conflicts:
ffmpeg.c
ffmpeg.h
ffmpeg_filter.c
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/log.c')
0 files changed, 0 insertions, 0 deletions