diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-06 10:34:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-06 10:34:14 +0100 |
| commit | baf10ad186edb9da522e44c332372d52a5c6b336 (patch) | |
| tree | 8d53b708f59c4ea0235cf034b59d89863ebd69e0 /libswscale/swscale_unscaled.c | |
| parent | 28adecf0fa1fa56db17b1f0e7711acb68baf00e7 (diff) | |
| parent | c57a593670308447aa1998259a1912273cc67fe9 (diff) | |
| download | ffmpeg-baf10ad186edb9da522e44c332372d52a5c6b336.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
hwaccel: consistent name prefixes for start_frame/end_frame/decode_slice
Conflicts:
libavcodec/vda_h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/swscale_unscaled.c')
0 files changed, 0 insertions, 0 deletions