third_party/ffmpeg/include/libavcodec/xvmc.h - Issue 854006: Revert 41386 - Removed custom FFmpegLock. Removed ffmpeg headers from third_p...

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: third_party/ffmpeg/include/libavcodec/xvmc.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

« no previous file with comments | « third_party/ffmpeg/include/libavcodec/vdpau.h ('k') | third_party/ffmpeg/include/libavformat/avformat.h » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2003 Ivan Kalvachev	2 * Copyright (C) 2003 Ivan Kalvachev

3 *	3 *

4 * This file is part of FFmpeg.	4 * This file is part of FFmpeg.

5 *	5 *

6 * FFmpeg is free software; you can redistribute it and/or	6 * FFmpeg is free software; you can redistribute it and/or

7 * modify it under the terms of the GNU Lesser General Public	7 * modify it under the terms of the GNU Lesser General Public

8 * License as published by the Free Software Foundation; either	8 * License as published by the Free Software Foundation; either

9 * version 2.1 of the License, or (at your option) any later version.	9 * version 2.1 of the License, or (at your option) any later version.

10 *	10 *

(...skipping 152 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
163 */	163 */

164 int state;	164 int state;

165	165

166 /** pointer to the surface where the subpicture is rendered */	166 /** pointer to the surface where the subpicture is rendered */

167 void* p_osd_target_surface_render;	167 void* p_osd_target_surface_render;

168 //}@	168 //}@

169 #endif	169 #endif

170 };	170 };

171	171

172 #endif /* AVCODEC_XVMC_H */	172 #endif /* AVCODEC_XVMC_H */

OLD	NEW