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

Unified Diff: third_party/ffmpeg/include/libavcodec/vdpau.h

Issue 56129: Update public FFmpeg header files from r16647 to r18286. (Closed)
Patch Set: Created 11 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 side-by-side diff with in-line comments
Download patch
« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/ffmpeg/include/libavcodec/vdpau.h
diff --git a/third_party/ffmpeg/include/libavcodec/vdpau.h b/third_party/ffmpeg/include/libavcodec/vdpau.h
index a28ad7fa825a2e1c9028325c7f4f2a53faefd934..53dbd7c02a61eda1fbb7911c85396b4c12861e33 100644
--- a/third_party/ffmpeg/include/libavcodec/vdpau.h
+++ b/third_party/ffmpeg/include/libavcodec/vdpau.h
@@ -70,8 +70,9 @@ struct vdpau_render_state {
/** picture parameter information for all supported codecs */
union VdpPictureInfo {
- VdpPictureInfoMPEG1Or2 mpeg;
VdpPictureInfoH264 h264;
+ VdpPictureInfoMPEG1Or2 mpeg;
+ VdpPictureInfoVC1 vc1;
} info;
/** Describe size/location of the compressed video data. */
« 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