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

Side by Side Diff: media/filters/ffmpeg_demuxer.h

Issue 100195: Enable video in linux build and remove unneeded ifdefs to guard windows. (Closed)
Patch Set: Fix inifite loop. Created 11 years, 7 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
« no previous file with comments | « media/filters/ffmpeg_audio_decoder.cc ('k') | media/filters/ffmpeg_glue.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Implements the Demuxer interface using FFmpeg's libavformat. At this time 5 // Implements the Demuxer interface using FFmpeg's libavformat. At this time
6 // will support demuxing any audio/video format thrown at it. The streams 6 // will support demuxing any audio/video format thrown at it. The streams
7 // output mime types audio/x-ffmpeg and video/x-ffmpeg and include an integer 7 // output mime types audio/x-ffmpeg and video/x-ffmpeg and include an integer
8 // key FFmpegCodecID which contains the CodecID enumeration value. The CodecIDs 8 // key FFmpegCodecID which contains the CodecID enumeration value. The CodecIDs
9 // can be used to create and initialize the corresponding FFmpeg decoder. 9 // can be used to create and initialize the corresponding FFmpeg decoder.
10 // 10 //
(...skipping 17 matching lines...) Expand all
28 #include "media/base/factory.h" 28 #include "media/base/factory.h"
29 #include "media/base/filters.h" 29 #include "media/base/filters.h"
30 #include "media/base/media_format.h" 30 #include "media/base/media_format.h"
31 31
32 // FFmpeg forward declarations. 32 // FFmpeg forward declarations.
33 struct AVCodecContext; 33 struct AVCodecContext;
34 struct AVBitStreamFilterContext; 34 struct AVBitStreamFilterContext;
35 struct AVFormatContext; 35 struct AVFormatContext;
36 struct AVPacket; 36 struct AVPacket;
37 struct AVStream; 37 struct AVStream;
38 enum CodecID;
39 38
40 namespace media { 39 namespace media {
41 40
42 class FFmpegDemuxer; 41 class FFmpegDemuxer;
43 42
44 // Forward declaration for scoped_ptr_malloc. 43 // Forward declaration for scoped_ptr_malloc.
45 class ScopedPtrAVFree; 44 class ScopedPtrAVFree;
46 45
47 class FFmpegDemuxerStream : public DemuxerStream { 46 class FFmpegDemuxerStream : public DemuxerStream {
48 public: 47 public:
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 162
164 // Thread handle. 163 // Thread handle.
165 base::Thread thread_; 164 base::Thread thread_;
166 165
167 DISALLOW_COPY_AND_ASSIGN(FFmpegDemuxer); 166 DISALLOW_COPY_AND_ASSIGN(FFmpegDemuxer);
168 }; 167 };
169 168
170 } // namespace media 169 } // namespace media
171 170
172 #endif // MEDIA_FILTERS_FFMPEG_DEMUXER_H_ 171 #endif // MEDIA_FILTERS_FFMPEG_DEMUXER_H_
OLDNEW
« no previous file with comments | « media/filters/ffmpeg_audio_decoder.cc ('k') | media/filters/ffmpeg_glue.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698