dv: Move a table used only by the demuxer out of a shared header.

pull/3/merge
Alex Converse 13 years ago
parent 89c9a8d3fd
commit 8dbdc2d840
  1. 4
      libavcodec/dvdata.h
  2. 4
      libavformat/dv.c

@ -95,10 +95,6 @@ static const uint8_t dv_audio_shuffle625[12][9] = {
{ 31, 67, 103, 21, 57, 93, 11, 47, 83},
};
static const av_unused int dv_audio_frequency[3] = {
48000, 44100, 32000,
};
/* macroblock bit budgets */
static const uint8_t block_sizes_dv2550[8] = {
112, 112, 112, 112, 80, 80, 0, 0,

@ -94,6 +94,10 @@ static const uint8_t* dv_extract_pack(uint8_t* frame, enum dv_pack_type t)
return frame[offs] == t ? &frame[offs] : NULL;
}
static const int dv_audio_frequency[3] = {
48000, 44100, 32000,
};
/*
* There's a couple of assumptions being made here:
* 1. By default we silence erroneous (0x8000/16bit 0x800/12bit) audio samples.

Loading…
Cancel
Save