Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(68)

Side by Side Diff: third_party/ffmpeg/include/libavcodec/vdpau.h

Issue 854006: Revert 41386 - Removed custom FFmpegLock. Removed ffmpeg headers from third_p... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
Property Changes:
Added: svn:mergeinfo
OLDNEW
1 /* 1 /*
2 * The Video Decode and Presentation API for UNIX (VDPAU) is used for 2 * The Video Decode and Presentation API for UNIX (VDPAU) is used for
3 * hardware-accelerated decoding of MPEG-1/2, H.264 and VC-1. 3 * hardware-accelerated decoding of MPEG-1/2, H.264 and VC-1.
4 * 4 *
5 * Copyright (C) 2008 NVIDIA 5 * Copyright (C) 2008 NVIDIA
6 * 6 *
7 * This file is part of FFmpeg. 7 * This file is part of FFmpeg.
8 * 8 *
9 * FFmpeg is free software; you can redistribute it and/or 9 * FFmpeg is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Lesser General Public 10 * modify it under the terms of the GNU Lesser General Public
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 77
78 /** Describe size/location of the compressed video data. */ 78 /** Describe size/location of the compressed video data. */
79 int bitstream_buffers_allocated; 79 int bitstream_buffers_allocated;
80 int bitstream_buffers_used; 80 int bitstream_buffers_used;
81 VdpBitstreamBuffer *bitstream_buffers; 81 VdpBitstreamBuffer *bitstream_buffers;
82 }; 82 };
83 83
84 /* @}*/ 84 /* @}*/
85 85
86 #endif /* AVCODEC_VDPAU_H */ 86 #endif /* AVCODEC_VDPAU_H */
OLDNEW
« no previous file with comments | « third_party/ffmpeg/include/libavcodec/opt.h ('k') | third_party/ffmpeg/include/libavcodec/xvmc.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698