diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-12 00:21:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-12 00:21:44 +0200 |
| commit | 2ec4586d77c18eff38c128936a67b7d7a2e7f9a0 (patch) | |
| tree | 376a5dc29dc6421c52dc395aef14ee6429f1eb68 /libavformat/ast.c | |
| parent | c4fe50b954a0490c54efca19682cfae00eba3145 (diff) | |
| parent | dd2d3b766b20196d0b65a82e3d897ccecbf7adb8 (diff) | |
| download | ffmpeg-2ec4586d77c18eff38c128936a67b7d7a2e7f9a0.tar.gz | |
Merge commit 'dd2d3b766b20196d0b65a82e3d897ccecbf7adb8'
* commit 'dd2d3b766b20196d0b65a82e3d897ccecbf7adb8':
lavc: Add hwaccel private data and init/uninit callbacks
Conflicts:
libavcodec/avcodec.h
libavcodec/internal.h
libavcodec/pthread_frame.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/ast.c')
0 files changed, 0 insertions, 0 deletions