Revert 77476 - Remove FFmpegVideoDecodeEngine's dependency on AVStream.

This change seems to have caused Linux Heapcheck bot redness.
http://build.chromium.org/p/chromium.memory/builders/Linux%20Heapcheck/builds/4846

First step of many towards removing DemuxerStream::QueryInterface, AVStreamProvider, and MediaFormat.

BUG=28206
TEST=media_unittests

Review URL: http://codereview.chromium.org/6624062

TBR=scherkus@chromium.org
Review URL: http://codereview.chromium.org/6665020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77770 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 42 deletions

diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc
index dce96a5..244d2729 100644
--- a/media/ffmpeg/ffmpeg_common.cc
+++ b/media/ffmpeg/ffmpeg_common.cc
@@ -4,50 +4,8 @@
 
 #include "media/ffmpeg/ffmpeg_common.h"
 
-#include "base/logging.h"
-
 namespace media {
 
 // TODO(scherkus): combine ffmpeg_common.h with ffmpeg_util.h
 
-VideoCodec CodecIDToVideoCodec(CodecID codec_id) {
-  switch (codec_id) {
-    case CODEC_ID_VC1:
-      return kCodecVC1;
-    case CODEC_ID_H264:
-      return kCodecH264;
-    case CODEC_ID_THEORA:
-      return kCodecTheora;
-    case CODEC_ID_MPEG2VIDEO:
-      return kCodecMPEG2;
-    case CODEC_ID_MPEG4:
-      return kCodecMPEG4;
-    case CODEC_ID_VP8:
-      return kCodecVP8;
-    default:
-      NOTREACHED();
-  }
-  return kUnknown;
-}
-
-CodecID VideoCodecToCodecID(VideoCodec video_codec) {
-  switch (video_codec) {
-    case kCodecVC1:
-      return CODEC_ID_VC1;
-    case kCodecH264:
-      return CODEC_ID_H264;
-    case kCodecTheora:
-      return CODEC_ID_THEORA;
-    case kCodecMPEG2:
-      return CODEC_ID_MPEG2VIDEO;
-    case kCodecMPEG4:
-      return CODEC_ID_MPEG4;
-    case kCodecVP8:
-      return CODEC_ID_VP8;
-    default:
-      NOTREACHED();
-  }
-  return CODEC_ID_NONE;
-}
-
 }  // namespace media