summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2006-11-23 22:26:05 +0000
committerAurelien Jacobs <aurel@gnuage.org>2006-11-23 22:26:05 +0000
commitb9d328597c4309b2dfd46e373b1b97b4509630e9 (patch)
tree9471c6ca8efae48df3a1959111c3b3e39bdac554
parent17c90b9d62fe395d40e7d80a47ff8a72d57e2a7c (diff)
No need for special trick anymore for flac in matroska.
The flac decoder now understand full metadata header in extradata. Originally committed as revision 7162 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/matroska.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/libavformat/matroska.c b/libavformat/matroska.c
index 32146d7c04..582d7d8fd3 100644
--- a/libavformat/matroska.c
+++ b/libavformat/matroska.c
@@ -2266,14 +2266,6 @@ matroska_read_header (AVFormatContext *s,
}
}
- else if (codec_id == CODEC_ID_FLAC) {
- AVPacket *pkt = av_mallocz(sizeof(AVPacket));
- av_new_packet(pkt, track->codec_priv_size);
- memcpy(pkt->data, track->codec_priv, track->codec_priv_size);
- matroska_queue_packet(matroska, pkt);
- track->codec_priv_size = 0;
- }
-
else if (codec_id == CODEC_ID_TTA) {
MatroskaAudioTrack *audiotrack = (MatroskaAudioTrack *) track;
ByteIOContext b;