From 9020e6974c35e2f80b7ea18a8e3257a274cfab22 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Fri, 11 May 2007 10:15:12 +0000
Subject: [PATCH] Merge RoQ entries

Originally committed as revision 8997 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 Changelog | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Changelog b/Changelog
index f71b2ce2958..976e07ff7e8 100644
--- a/Changelog
+++ b/Changelog
@@ -82,9 +82,8 @@ version <next>
 - CRYO APC demuxer
 - Atrac3 decoder
 - V.Flash PTX decoder
-- RoQ audio encoder
+- RoQ muxer, audio encoder
 - Renderware TXD demuxer and decoder
-- RoQ muxer
 
 version 0.4.9-pre1:
 
-- 
GitLab