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

diff --git a/libavformat/matroska.c b/libavformat/matroska.c
index 32146d7c045bbe79359abfaa0311df97f8497c22..582d7d8fd38a19b8fc96376a87d39900cf3c2e2c 100644 (file)
--- 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;