add FFDS fourcc, ok'd by kostya

[ffmpeg] / libavformat / tta.c

diff --git a/libavformat/tta.c b/libavformat/tta.c
index 2cd0101f1506e664b9668371311d0f1d74b4e463..884664c98d011c50f6079b1da169a2c685f3f710 100644 (file)
--- a/libavformat/tta.c
+++ b/libavformat/tta.c
@@ -18,8 +18,9 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavcodec/bitstream.h"
 #include "avformat.h"
-#include "bitstream.h"
 
 typedef struct {
     int totalframes, currentframe;
@@ -90,7 +91,7 @@ static int tta_read_header(AVFormatContext *s, AVFormatParameters *ap)
     st->codec->codec_id = CODEC_ID_TTA;
     st->codec->channels = channels;
     st->codec->sample_rate = samplerate;
-    st->codec->bits_per_sample = bps;
+    st->codec->bits_per_coded_sample = bps;
 
     st->codec->extradata_size = url_ftell(s->pb);
     if(st->codec->extradata_size+FF_INPUT_BUFFER_PADDING_SIZE <= (unsigned)st->codec->extradata_size){
@@ -138,7 +139,7 @@ static int tta_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp
 
 AVInputFormat tta_demuxer = {
     "tta",
-    "true-audio",
+    NULL_IF_CONFIG_SMALL("True Audio"),
     sizeof(TTAContext),
     tta_probe,
     tta_read_header,