[FFmpeg-cvslog] dv: Move a table used only by the demuxer out of a shared header.

Alex Converse git at videolan.org
Sat Feb 11 01:35:37 CET 2012


ffmpeg | branch: master | Alex Converse <alex.converse at gmail.com> | Thu Feb  9 17:53:05 2012 -0800| [8dbdc2d8407e8e3f4ca0e75b8684b8fc81fd4bcd] | committer: Alex Converse

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8dbdc2d8407e8e3f4ca0e75b8684b8fc81fd4bcd
---

 libavcodec/dvdata.h |    4 ----
 libavformat/dv.c    |    4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavcodec/dvdata.h b/libavcodec/dvdata.h
index 90ef7ed..46976f9 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 0201a80..769f6b7 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.



More information about the ffmpeg-cvslog mailing list