cosmetics, alignment

[frescor/ffmpeg.git] / libavformat / movenc.c

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index e4c5a6c0fc75034e95865ff81c6951d2682583ce..d8e8330dfab736b0e5590a577f0e50764268cabe 100644 (file)
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -26,7 +26,8 @@
 #include "avio.h"
 #include "isom.h"
 #include "avc.h"
-#include "libavcodec/bitstream.h"
+#include "libavcodec/get_bits.h"
+#include "libavcodec/put_bits.h"
 
 #undef NDEBUG
 #include <assert.h>
@@ -613,8 +614,14 @@ static const struct {
     { PIX_FMT_YUYV422, MKTAG('y','u','v','s'),  0 },
     { PIX_FMT_UYVY422, MKTAG('2','v','u','y'),  0 },
     { PIX_FMT_BGR555,  MKTAG('r','a','w',' '), 16 },
+    { PIX_FMT_RGB555LE,MKTAG('L','5','5','5'), 16 },
+    { PIX_FMT_RGB565LE,MKTAG('L','5','6','5'), 16 },
+    { PIX_FMT_RGB565BE,MKTAG('B','5','6','5'), 16 },
     { PIX_FMT_RGB24,   MKTAG('r','a','w',' '), 24 },
-    { PIX_FMT_BGR32_1, MKTAG('r','a','w',' '), 32 },
+    { PIX_FMT_BGR24,   MKTAG('2','4','B','G'), 24 },
+    { PIX_FMT_ARGB,    MKTAG('r','a','w',' '), 32 },
+    { PIX_FMT_BGRA,    MKTAG('B','G','R','A'), 32 },
+    { PIX_FMT_RGBA,    MKTAG('R','G','B','A'), 32 },
 };
 
 static int mov_get_rawvideo_codec_tag(AVFormatContext *s, MOVTrack *track)
@@ -1842,7 +1849,7 @@ static int mov_write_packet(AVFormatContext *s, AVPacket *pkt)
     }
 
     if ((enc->codec_id == CODEC_ID_DNXHD ||
-                enc->codec_id == CODEC_ID_AC3) && !trk->vosLen) {
+         enc->codec_id == CODEC_ID_AC3) && !trk->vosLen) {
         /* copy frame to create needed atoms */
         trk->vosLen = size;
         trk->vosData = av_malloc(size);