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

Side by Side Diff: patched-ffmpeg-mt/libavformat/asf.h

Issue 789004: ffmpeg roll of source to mar 9 version... (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2000, 2001 Fabrice Bellard 2 * Copyright (c) 2000, 2001 Fabrice Bellard
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 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 extern const ff_asf_guid ff_asf_codec_comment_header; 151 extern const ff_asf_guid ff_asf_codec_comment_header;
152 extern const ff_asf_guid ff_asf_codec_comment1_header; 152 extern const ff_asf_guid ff_asf_codec_comment1_header;
153 extern const ff_asf_guid ff_asf_data_header; 153 extern const ff_asf_guid ff_asf_data_header;
154 extern const ff_asf_guid ff_asf_head1_guid; 154 extern const ff_asf_guid ff_asf_head1_guid;
155 extern const ff_asf_guid ff_asf_head2_guid; 155 extern const ff_asf_guid ff_asf_head2_guid;
156 extern const ff_asf_guid ff_asf_extended_content_header; 156 extern const ff_asf_guid ff_asf_extended_content_header;
157 extern const ff_asf_guid ff_asf_simple_index_header; 157 extern const ff_asf_guid ff_asf_simple_index_header;
158 extern const ff_asf_guid ff_asf_ext_stream_embed_stream_header; 158 extern const ff_asf_guid ff_asf_ext_stream_embed_stream_header;
159 extern const ff_asf_guid ff_asf_ext_stream_audio_stream; 159 extern const ff_asf_guid ff_asf_ext_stream_audio_stream;
160 extern const ff_asf_guid ff_asf_metadata_header; 160 extern const ff_asf_guid ff_asf_metadata_header;
161 extern const ff_asf_guid ff_asf_marker_header;
161 extern const ff_asf_guid ff_asf_my_guid; 162 extern const ff_asf_guid ff_asf_my_guid;
162 extern const ff_asf_guid ff_asf_language_guid; 163 extern const ff_asf_guid ff_asf_language_guid;
163 extern const ff_asf_guid ff_asf_content_encryption; 164 extern const ff_asf_guid ff_asf_content_encryption;
164 extern const ff_asf_guid ff_asf_ext_content_encryption; 165 extern const ff_asf_guid ff_asf_ext_content_encryption;
165 extern const ff_asf_guid ff_asf_digital_signature; 166 extern const ff_asf_guid ff_asf_digital_signature;
166 167
167 extern const AVMetadataConv ff_asf_metadata_conv[]; 168 extern const AVMetadataConv ff_asf_metadata_conv[];
168 169
169 #define ASF_PACKET_FLAG_ERROR_CORRECTION_PRESENT 0x80 //1000 0000 170 #define ASF_PACKET_FLAG_ERROR_CORRECTION_PRESENT 0x80 //1000 0000
170 171
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 224
224 #define ASF_PL_FLAG_PAYLOAD_LENGTH_FIELD_IS_BYTE 0x40 //0100 0000 225 #define ASF_PL_FLAG_PAYLOAD_LENGTH_FIELD_IS_BYTE 0x40 //0100 0000
225 #define ASF_PL_FLAG_PAYLOAD_LENGTH_FIELD_IS_WORD 0x80 //1000 0000 226 #define ASF_PL_FLAG_PAYLOAD_LENGTH_FIELD_IS_WORD 0x80 //1000 0000
226 #define ASF_PL_MASK_PAYLOAD_LENGTH_FIELD_SIZE 0xc0 //1100 0000 227 #define ASF_PL_MASK_PAYLOAD_LENGTH_FIELD_SIZE 0xc0 //1100 0000
227 228
228 #define ASF_PL_FLAG_KEY_FRAME 0x80 //1000 0000 229 #define ASF_PL_FLAG_KEY_FRAME 0x80 //1000 0000
229 230
230 extern AVInputFormat asf_demuxer; 231 extern AVInputFormat asf_demuxer;
231 232
232 #endif /* AVFORMAT_ASF_H */ 233 #endif /* AVFORMAT_ASF_H */
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698