RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '86a361081d3eb4e999d75bc2a462f01d88cbd2e5' 

* commit '86a361081d3eb4e999d75bc2a462f01d88cbd2e5':
  lmlm4: K&R formatting cosmetics

Conflicts:
	libavformat/lmlm4.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-09-25 13:51:43 +02:00
parent 8f3d3e5f83 86a361081d
commit 59f4966756
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libavformat/lmlm4.c
View File

@ -23,6 +23,7 @@
*/ */
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "avformat.h" #include "avformat.h"
#include "internal.h" #include "internal.h"
@ -34,23 +35,23 @@
#define LMLM4_MAX_PACKET_SIZE 1024 * 1024 #define LMLM4_MAX_PACKET_SIZE 1024 * 1024
static int lmlm4_probe(AVProbeData * pd) { static int lmlm4_probe(AVProbeData *pd)
{
const unsigned char *buf = pd->buf; const unsigned char *buf = pd->buf;
unsigned int frame_type, packet_size; unsigned int frame_type, packet_size;
frame_type = AV_RB16(buf+2); frame_type = AV_RB16(buf + 2);
packet_size = AV_RB32(buf+4); packet_size = AV_RB32(buf + 4);
if (!AV_RB16(buf) && frame_type <= LMLM4_MPEG1L2 && packet_size && if (!AV_RB16(buf) && frame_type <= LMLM4_MPEG1L2 && packet_size &&
frame_type != LMLM4_INVALID && packet_size <= LMLM4_MAX_PACKET_SIZE) { frame_type != LMLM4_INVALID && packet_size <= LMLM4_MAX_PACKET_SIZE) {
if (frame_type == LMLM4_MPEG1L2) { if (frame_type == LMLM4_MPEG1L2) {
if ((AV_RB16(buf+8) & 0xfffe) != 0xfffc) if ((AV_RB16(buf + 8) & 0xfffe) != 0xfffc)
return 0; return 0;
/* I could calculate the audio framesize and compare with /* I could calculate the audio framesize and compare with
* packet_size-8, but that seems overkill */ * packet_size-8, but that seems overkill */
return AVPROBE_SCORE_MAX / 3; 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; return AVPROBE_SCORE_MAX / 5;
} }
} }
@ -58,7 +59,8 @@ static int lmlm4_probe(AVProbeData * pd) {
return 0; return 0;
} }
static int lmlm4_read_header(AVFormatContext *s) { static int lmlm4_read_header(AVFormatContext *s)
{
AVStream *st; AVStream *st;
if (!(st = avformat_new_stream(s, NULL))) if (!(st = avformat_new_stream(s, NULL)))
@ -78,7 +80,8 @@ static int lmlm4_read_header(AVFormatContext *s) {
return 0; return 0;
} }
static int lmlm4_read_packet(AVFormatContext *s, AVPacket *pkt) { static int lmlm4_read_packet(AVFormatContext *s, AVPacket *pkt)
{
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
int ret; int ret;
unsigned int frame_type, packet_size, padding, frame_size; 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); avio_skip(pb, padding);
switch (frame_type) { switch (frame_type) {
case LMLM4_I_FRAME: case LMLM4_I_FRAME:
pkt->flags = AV_PKT_FLAG_KEY; pkt->flags = AV_PKT_FLAG_KEY;
case LMLM4_P_FRAME: case LMLM4_P_FRAME:
case LMLM4_B_FRAME: case LMLM4_B_FRAME:
pkt->stream_index = 0; pkt->stream_index = 0;
break; break;
case LMLM4_MPEG1L2: case LMLM4_MPEG1L2:
pkt->stream_index = 1; pkt->stream_index = 1;
break; break;
} }
return ret; return ret;