diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-25 03:38:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-25 03:45:29 +0200 |
| commit | 5fd3e6965e58aee59e9bf26e38e2a3925535ab21 (patch) | |
| tree | aa7e3a03bf9e47ad176640bad7a2dad149eb1433 | |
| parent | 0abfb0a9d8c430ffd7ddd5bbea05623353b15cf2 (diff) | |
| download | ffmpeg-5fd3e6965e58aee59e9bf26e38e2a3925535ab21.tar.gz | |
vocenc: use new header from codec tag 4
this matches sox and should fix ticket1119
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/vocenc.c | 2 | ||||
| -rw-r--r-- | tests/ref/lavf/voc_s16 | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/vocenc.c b/libavformat/vocenc.c index 4965322791..4e382bf26f 100644 --- a/libavformat/vocenc.c +++ b/libavformat/vocenc.c @@ -52,7 +52,7 @@ static int voc_write_packet(AVFormatContext *s, AVPacket *pkt) AVIOContext *pb = s->pb; if (!voc->param_written) { - if (enc->codec_tag > 0xFF) { + if (enc->codec_tag > 3) { avio_w8(pb, VOC_TYPE_NEW_VOICE_DATA); avio_wl24(pb, pkt->size + 12); avio_wl32(pb, enc->sample_rate); diff --git a/tests/ref/lavf/voc_s16 b/tests/ref/lavf/voc_s16 index d404fe345d..23e5aab3c3 100644 --- a/tests/ref/lavf/voc_s16 +++ b/tests/ref/lavf/voc_s16 @@ -1,3 +1,3 @@ -1d7be2b6527b76a33d2185ec6fb23f91 *./tests/data/lavf/lavf.s16.voc -180437 ./tests/data/lavf/lavf.s16.voc +a8225786fdbf5a2a19d1eeaf15f28632 *./tests/data/lavf/lavf.s16.voc +180439 ./tests/data/lavf/lavf.s16.voc ./tests/data/lavf/lavf.s16.voc CRC=0x7bd585ff |