Fix media code to work with new ffmpeg.

media/base/audio_decoder_config.h

Index: media/base/audio_decoder_config.h
diff --git a/media/base/audio_decoder_config.h b/media/base/audio_decoder_config.h
index 90f51c19982000d8869dbadecabfe535b41e64b2..0f93c17c2e13a1ddcc03b9b47a6a189ca93c07d3 100644
--- a/media/base/audio_decoder_config.h
+++ b/media/base/audio_decoder_config.h
@@ -35,6 +35,8 @@ enum AudioCodec {
   kAudioCodecMax = kCodecPCM_MULAW  // Must equal the last "real" codec above.
 };
 
+// TODO(dalecurtis): FFmpeg API uses bytes_per_channel instead of
+// bits_per_channel, we should match them.

[scherkus (not reviewing), 2012/02/07 19:21:29]

nit: want to move this down by the function itself?

also annotate w/ ()

I'd also say that this TODO isn't about matching FFmpeg per se, just that bits
are more confusing to work with :)

[DaleCurtis, 2012/02/07 22:53:55]

I put it up here since there are several functions and variables which
references bits_per_channel. The () is just for functions right? These are
variable names.

I did clarify the comment a bit. Once the DEPS roll is ready, I'll ping you
again for one last look at those bits.

 class MEDIA_EXPORT AudioDecoderConfig {
  public:
   // Constructs an uninitialized object. Clients should call Initialize() with