[FFmpeg-cvslog] lmlm4: K&R formatting cosmetics
Gabriel Dume
git at videolan.org
Thu Sep 25 14:00:47 CEST 2014
ffmpeg | branch: master | Gabriel Dume <gabriel.ddx84 at gmail.com> | Tue Sep 23 10:29:58 2014 -0400| [86a361081d3eb4e999d75bc2a462f01d88cbd2e5] | committer: Diego Biurrun
lmlm4: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego at biurrun.de>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=86a361081d3eb4e999d75bc2a462f01d88cbd2e5
---
libavformat/lmlm4.c | 37 ++++++++++++++++++++-----------------
1 file changed, 20 insertions(+), 17 deletions(-)
diff --git a/libavformat/lmlm4.c b/libavformat/lmlm4.c
index b67b68e..1fb03e7 100644
--- a/libavformat/lmlm4.c
+++ b/libavformat/lmlm4.c
@@ -23,6 +23,7 @@
*/
#include "libavutil/intreadwrite.h"
+
#include "avformat.h"
#include "internal.h"
@@ -34,23 +35,23 @@
#define LMLM4_MAX_PACKET_SIZE 1024 * 1024
-static int lmlm4_probe(AVProbeData * pd) {
+static int lmlm4_probe(AVProbeData *pd)
+{
unsigned char *buf = pd->buf;
unsigned int frame_type, packet_size;
- frame_type = AV_RB16(buf+2);
- packet_size = AV_RB32(buf+4);
+ frame_type = AV_RB16(buf + 2);
+ packet_size = AV_RB32(buf + 4);
if (!AV_RB16(buf) && frame_type <= LMLM4_MPEG1L2 && packet_size &&
frame_type != LMLM4_INVALID && packet_size <= LMLM4_MAX_PACKET_SIZE) {
-
if (frame_type == LMLM4_MPEG1L2) {
- if ((AV_RB16(buf+8) & 0xfffe) != 0xfffc)
+ if ((AV_RB16(buf + 8) & 0xfffe) != 0xfffc)
return 0;
/* I could calculate the audio framesize and compare with
* packet_size-8, but that seems overkill */
return AVPROBE_SCORE_MAX / 3;
- } else if (AV_RB24(buf+8) == 0x000001) { /* PES Signal */
+ } else if (AV_RB24(buf + 8) == 0x000001) { /* PES Signal */
return AVPROBE_SCORE_MAX / 5;
}
}
@@ -58,7 +59,8 @@ static int lmlm4_probe(AVProbeData * pd) {
return 0;
}
-static int lmlm4_read_header(AVFormatContext *s) {
+static int lmlm4_read_header(AVFormatContext *s)
+{
AVStream *st;
if (!(st = avformat_new_stream(s, NULL)))
@@ -78,7 +80,8 @@ static int lmlm4_read_header(AVFormatContext *s) {
return 0;
}
-static int lmlm4_read_packet(AVFormatContext *s, AVPacket *pkt) {
+static int lmlm4_read_packet(AVFormatContext *s, AVPacket *pkt)
+{
AVIOContext *pb = s->pb;
int ret;
unsigned int frame_type, packet_size, padding, frame_size;
@@ -104,15 +107,15 @@ static int lmlm4_read_packet(AVFormatContext *s, AVPacket *pkt) {
avio_skip(pb, padding);
switch (frame_type) {
- case LMLM4_I_FRAME:
- pkt->flags = AV_PKT_FLAG_KEY;
- case LMLM4_P_FRAME:
- case LMLM4_B_FRAME:
- pkt->stream_index = 0;
- break;
- case LMLM4_MPEG1L2:
- pkt->stream_index = 1;
- break;
+ case LMLM4_I_FRAME:
+ pkt->flags = AV_PKT_FLAG_KEY;
+ case LMLM4_P_FRAME:
+ case LMLM4_B_FRAME:
+ pkt->stream_index = 0;
+ break;
+ case LMLM4_MPEG1L2:
+ pkt->stream_index = 1;
+ break;
}
return ret;
More information about the ffmpeg-cvslog
mailing list