[SCM] libav/experimental: matroskadec: cosmetics: indentation
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:52:22 UTC 2013
The following commit has been merged in the experimental branch:
commit 553e9f75297c84939ba1fa8c87cfa0ee6c6a6e84
Author: Aurelien Jacobs <aurel at gnuage.org>
Date: Thu Oct 1 21:15:36 2009 +0000
matroskadec: cosmetics: indentation
Originally committed as revision 20133 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index bf69fc2..688169a 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1352,19 +1352,19 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap)
track->default_duration, 1000000000, 30000);
if (!st->codec->extradata) {
- if(extradata){
- st->codec->extradata = extradata;
- st->codec->extradata_size = extradata_size;
- } else if(track->codec_priv.data && track->codec_priv.size > 0){
- st->codec->extradata = av_mallocz(track->codec_priv.size +
- FF_INPUT_BUFFER_PADDING_SIZE);
- if(st->codec->extradata == NULL)
- return AVERROR(ENOMEM);
- st->codec->extradata_size = track->codec_priv.size;
- memcpy(st->codec->extradata,
- track->codec_priv.data + extradata_offset,
- track->codec_priv.size);
- }
+ if(extradata){
+ st->codec->extradata = extradata;
+ st->codec->extradata_size = extradata_size;
+ } else if(track->codec_priv.data && track->codec_priv.size > 0){
+ st->codec->extradata = av_mallocz(track->codec_priv.size +
+ FF_INPUT_BUFFER_PADDING_SIZE);
+ if(st->codec->extradata == NULL)
+ return AVERROR(ENOMEM);
+ st->codec->extradata_size = track->codec_priv.size;
+ memcpy(st->codec->extradata,
+ track->codec_priv.data + extradata_offset,
+ track->codec_priv.size);
+ }
}
if (track->type == MATROSKA_TRACK_TYPE_VIDEO) {
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list