aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Converse <alex.converse@gmail.com>2012-02-09 17:53:05 -0800
committerAlex Converse <alex.converse@gmail.com>2012-02-09 19:16:15 -0800
commit8dbdc2d8407e8e3f4ca0e75b8684b8fc81fd4bcd (patch)
tree8b9fa345e96d1097756c62baf23486db326b9dd1
parent89c9a8d3fdaef610f276e28f02cc46c581d05ef0 (diff)
downloadffmpeg-8dbdc2d8407e8e3f4ca0e75b8684b8fc81fd4bcd.tar.gz
dv: Move a table used only by the demuxer out of a shared header.
-rw-r--r--libavcodec/dvdata.h4
-rw-r--r--libavformat/dv.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/dvdata.h b/libavcodec/dvdata.h
index 90ef7ed1df..46976f954a 100644
--- a/libavcodec/dvdata.h
+++ b/libavcodec/dvdata.h
@@ -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,
diff --git a/libavformat/dv.c b/libavformat/dv.c
index 0201a80b31..769f6b74f4 100644
--- a/libavformat/dv.c
+++ b/libavformat/dv.c
@@ -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.