diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-20 23:07:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-20 23:08:58 +0100 |
| commit | 19139d8516dd676622e17533dd5704baaabb796e (patch) | |
| tree | fece8bbcec0b317fcec6e5c2fd50c1b2a0d8c5d0 /libavcodec/msmpeg4data.c | |
| parent | 1ec295a5c52bfe9a604bfb2a74041672db058324 (diff) | |
| parent | 8b6136d3d18f44b4913803f8400d5d99b1e5b873 (diff) | |
| download | ffmpeg-19139d8516dd676622e17533dd5704baaabb796e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vaapi: switch ff_vaapi_get_surface_id from Picture to AVFrame
Conflicts:
libavcodec/vaapi.c
libavcodec/vaapi_internal.h
See: 377cfc28a226a66d6f872f0a16b3811208011ebc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/msmpeg4data.c')
0 files changed, 0 insertions, 0 deletions