← Back to branch summary

~ubuntu-branches/ubuntu/vivid/ffmpeg/vivid

« back to all changes in this revision

Viewing changes to libavcodec/dxva2_internal.h

  • Committer: Package Import Robot
  • Author(s): Andreas Cadhalpun
  • Date: 2014-11-05 01:18:23 UTC
  • mfrom: (0.2.17 sid)
  • Revision ID: package-import@ubuntu.com-20141105011823-xsbeceffs43wtkn7
Tags: 7:2.4.3-1
* Import new upstream bugfix release 2.4.3.
   - Refresh Change-symbol-versioning.patch.
   - Add new symbols to the libavdevice symbols file.
* Enable libbs2b on arm64, since it is now available.
* Disable frei0r and libx264 on x32, libsoxr and openal on sparc64
  and libopencv on m68k, sh4, sparc64 and x32, because they are not
  (yet) avialable there.
* Disable assembler optimizations on x32, as they wouldn't work there.
* Include config.log in the build-log, when compiling fails.
* Add fix-hppa-tests.patch to work around a gcc bug on hppa.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/dxva2_internal.h
23
23
#ifndef AVCODEC_DXVA_INTERNAL_H
24
24
#define AVCODEC_DXVA_INTERNAL_H
25
25
 
 
26
#define COBJMACROS
 
27
 
 
28
#include "config.h"
 
29
 
26
30
#include "dxva2.h"
 
31
#if HAVE_DXVA_H
 
32
#include <dxva.h>
 
33
#endif
 
34
 
27
35
#include "avcodec.h"
28
36
#include "mpegvideo.h"
29
37
 
30
 
void *ff_dxva2_get_surface(const Picture *picture);
 
38
void *ff_dxva2_get_surface(const AVFrame *frame);
31
39
 
32
40
unsigned ff_dxva2_get_surface_index(const struct dxva_context *,
33
 
                                    const Picture *picture);
 
41
                                    const AVFrame *frame);
34
42
 
35
43
int ff_dxva2_commit_buffer(AVCodecContext *, struct dxva_context *,
36
44
                           DXVA2_DecodeBufferDesc *,
38
46
                           unsigned mb_count);
39
47
 
40
48
 
41
 
int ff_dxva2_common_end_frame(AVCodecContext *, MpegEncContext *,
 
49
int ff_dxva2_common_end_frame(AVCodecContext *, AVFrame *,
42
50
                              const void *pp, unsigned pp_size,
43
51
                              const void *qm, unsigned qm_size,
44
52
                              int (*commit_bs_si)(AVCodecContext *,