Revert 42415 - Removed custom FFmpegLock. Removed ffmpeg headers from third_party/ffmpeg/include.
Patch by sergeyu@chromium.org BUG=23271 TEST=none Review URL: http://codereview.chromium.org/1213002 TBR=scherkus@chromium.org Review URL: http://codereview.chromium.org/1240002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42422 0039d316-1c4b-4281-b951-d872f2087c98
Showing
- DEPS 6 additions, 4 deletionsDEPS
- media/base/mock_ffmpeg.cc 0 additions, 10 deletionsmedia/base/mock_ffmpeg.cc
- media/base/mock_ffmpeg.h 0 additions, 1 deletionmedia/base/mock_ffmpeg.h
- media/ffmpeg/ffmpeg_common.cc 10 additions, 0 deletionsmedia/ffmpeg/ffmpeg_common.cc
- media/ffmpeg/ffmpeg_common.h 23 additions, 3 deletionsmedia/ffmpeg/ffmpeg_common.h
- media/filters/ffmpeg_audio_decoder.cc 5 additions, 2 deletionsmedia/filters/ffmpeg_audio_decoder.cc
- media/filters/ffmpeg_demuxer.cc 12 additions, 6 deletionsmedia/filters/ffmpeg_demuxer.cc
- media/filters/ffmpeg_glue.cc 0 additions, 26 deletionsmedia/filters/ffmpeg_glue.cc
- media/filters/ffmpeg_video_decode_engine.cc 10 additions, 6 deletionsmedia/filters/ffmpeg_video_decode_engine.cc
- third_party/ffmpeg/avcodec-52.sigs 0 additions, 1 deletionthird_party/ffmpeg/avcodec-52.sigs
- third_party/ffmpeg/ffmpeg.gyp 4 additions, 6 deletionsthird_party/ffmpeg/ffmpeg.gyp
- third_party/ffmpeg/ffmpeg_stub_headers.fragment 2 additions, 4 deletionsthird_party/ffmpeg/ffmpeg_stub_headers.fragment
- third_party/ffmpeg/include/libavcodec/avcodec.h 3755 additions, 0 deletionsthird_party/ffmpeg/include/libavcodec/avcodec.h
- third_party/ffmpeg/include/libavcodec/opt.h 156 additions, 0 deletionsthird_party/ffmpeg/include/libavcodec/opt.h
- third_party/ffmpeg/include/libavcodec/vdpau.h 86 additions, 0 deletionsthird_party/ffmpeg/include/libavcodec/vdpau.h
- third_party/ffmpeg/include/libavcodec/xvmc.h 172 additions, 0 deletionsthird_party/ffmpeg/include/libavcodec/xvmc.h
- third_party/ffmpeg/include/libavformat/avformat.h 1238 additions, 0 deletionsthird_party/ffmpeg/include/libavformat/avformat.h
- third_party/ffmpeg/include/libavformat/avio.h 406 additions, 0 deletionsthird_party/ffmpeg/include/libavformat/avio.h
- third_party/ffmpeg/include/libavutil/adler32.h 30 additions, 0 deletionsthird_party/ffmpeg/include/libavutil/adler32.h
- third_party/ffmpeg/include/libavutil/avstring.h 90 additions, 0 deletionsthird_party/ffmpeg/include/libavutil/avstring.h
Loading
Please register or sign in to comment