ffmpeg chromium glue

media/base/mock_ffmpeg.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/base/mock_ffmpeg.h"
 
 #include "base/logging.h"
 #include "media/ffmpeg/ffmpeg_common.h"
 
 using ::testing::_;
@@ skipping 93 matching lines @@
   return MockFFmpeg::get()->AVCodecFindDecoder(id);
 }
 
 int avcodec_open(AVCodecContext* avctx, AVCodec* codec) {
   return MockFFmpeg::get()->AVCodecOpen(avctx, codec);
 }
 
 int avcodec_close(AVCodecContext* avctx) {
   return MockFFmpeg::get()->AVCodecClose(avctx);
 }
-
-int avcodec_thread_init(AVCodecContext* avctx, int threads) {
-  return MockFFmpeg::get()->AVCodecThreadInit(avctx, threads);
-}
+// Deprecated
+//int avcodec_thread_init(AVCodecContext* avctx, int threads) {

[scherkus (not reviewing), 2011/06/29 17:00:36]

was the function signature changed?

can we get rid of this?

[fbarchard, 2011/06/29 18:28:27]

code review for ffmpeg said
"they should be renamed to ff_ and wrapers removed once the major ver is bumped"

[ilja, 2011/06/29 21:40:05]

Done.

+//  return MockFFmpeg::get()->AVCodecThreadInit(avctx, threads);
+//}
 
 void avcodec_flush_buffers(AVCodecContext* avctx) {
   return MockFFmpeg::get()->AVCodecFlushBuffers(avctx);
 }
 
 AVCodecContext* avcodec_alloc_context() {
   return MockFFmpeg::get()->AVCodecAllocContext();
 }
 
 AVFrame* avcodec_alloc_frame() {
@@ skipping 91 matching lines @@
   MockFFmpeg::get()->AVLogSetLevel(level);
 }
 
 void av_destruct_packet(AVPacket *pkt) {
   MockFFmpeg::get()->AVDestructPacket(pkt);
 }
 
 }  // extern "C"
 
 }  // namespace media