[FFmpeg-cvslog] avformat/riffenc: indent
Peter Ross
git at videolan.org
Tue Dec 24 08:14:28 CET 2013
ffmpeg | branch: release/1.2 | Peter Ross <pross at xvid.org> | Mon Dec 23 20:37:13 2013 +1100| [9f3135b30bfb04dc507305044687797cdb73bfa2] | committer: Carl Eugen Hoyos
avformat/riffenc: indent
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit f93b0abe4041b75f0dbb590ee932b37a07662856)
Conflicts:
libavformat/riffenc.c
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9f3135b30bfb04dc507305044687797cdb73bfa2
---
libavformat/riff.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavformat/riff.c b/libavformat/riff.c
index bb4d067..be0505d 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -587,10 +587,10 @@ void ff_put_bmp_header(AVIOContext *pb, AVCodecContext *enc, const AVCodecTag *t
avio_wl32(pb, 0);
if (!ignore_extradata) {
- avio_write(pb, enc->extradata, enc->extradata_size);
+ avio_write(pb, enc->extradata, enc->extradata_size);
- if (!for_asf && enc->extradata_size & 1)
- avio_w8(pb, 0);
+ if (!for_asf && enc->extradata_size & 1)
+ avio_w8(pb, 0);
}
}
More information about the ffmpeg-cvslog
mailing list