virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  mmf: K&R formatting cosmetics

Conflicts:
	libavformat/mmf.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-05-10 09:35:33 +02:00
parent 500220a8e8 ee9a4dff4a
commit c475a58dd6
1 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libavformat/mmf.c
View File

@@ -21,8 +21,8 @@
#include "libavutil/channel_layout.h" #include "libavutil/channel_layout.h"
#include "avformat.h" #include "avformat.h"
#include "internal.h"
#include "avio_internal.h" #include "avio_internal.h"
#include "internal.h"
#include "pcm.h" #include "pcm.h"
#include "rawenc.h" #include "rawenc.h"
#include "riff.h" #include "riff.h"
@@ -75,7 +75,8 @@ static int mmf_write_header(AVFormatContext *s)
rate = mmf_rate_code(s->streams[0]->codec->sample_rate); rate = mmf_rate_code(s->streams[0]->codec->sample_rate);
if (rate < 0) { if (rate < 0) {
av_log(s, AV_LOG_ERROR, "Unsupported sample rate %d, supported are 4000, 8000, 11025, 22050 and 44100\n", s->streams[0]->codec->sample_rate); av_log(s, AV_LOG_ERROR, "Unsupported sample rate %d, supported are 4000, 8000, 11025, 22050 and 44100\n",
s->streams[0]->codec->sample_rate);
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
@@ -209,8 +210,10 @@ static int mmf_read_header(AVFormatContext *s)
for (;; avio_skip(pb, size)) { for (;; avio_skip(pb, size)) {
tag = avio_rl32(pb); tag = avio_rl32(pb);
size = avio_rb32(pb); size = avio_rb32(pb);
if(tag == MKTAG('C','N','T','I')) continue; if (tag == MKTAG('C', 'N', 'T', 'I'))
if(tag == MKTAG('O','P','D','A')) continue; continue;
if (tag == MKTAG('O', 'P', 'D', 'A'))
continue;
break; break;
} }
@@ -240,8 +243,10 @@ static int mmf_read_header(AVFormatContext *s)
for (;; avio_skip(pb, size)) { for (;; avio_skip(pb, size)) {
tag = avio_rl32(pb); tag = avio_rl32(pb);
size = avio_rb32(pb); size = avio_rb32(pb);
if(tag == MKTAG('A','t','s','q')) continue; if (tag == MKTAG('A', 't', 's', 'q'))
if(tag == MKTAG('A','s','p','I')) continue; continue;
if (tag == MKTAG('A', 's', 'p', 'I'))
continue;
break; break;
} }
@@ -262,7 +267,8 @@ static int mmf_read_header(AVFormatContext *s)
st->codec->channels = (params >> 7) + 1; st->codec->channels = (params >> 7) + 1;
st->codec->channel_layout = params >> 7 ? AV_CH_LAYOUT_STEREO : AV_CH_LAYOUT_MONO; st->codec->channel_layout = params >> 7 ? AV_CH_LAYOUT_STEREO : AV_CH_LAYOUT_MONO;
st->codec->bits_per_coded_sample = 4; st->codec->bits_per_coded_sample = 4;
st->codec->bit_rate = st->codec->sample_rate * st->codec->bits_per_coded_sample; st->codec->bit_rate = st->codec->sample_rate *
st->codec->bits_per_coded_sample;
avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate); avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
@@ -271,8 +277,7 @@ static int mmf_read_header(AVFormatContext *s)
#define MAX_SIZE 4096 #define MAX_SIZE 4096
static int mmf_read_packet(AVFormatContext *s, static int mmf_read_packet(AVFormatContext *s, AVPacket *pkt)
AVPacket *pkt)
{ {
MMFContext *mmf = s->priv_data; MMFContext *mmf = s->priv_data;
int64_t left, size; int64_t left, size;
@@ -303,6 +308,7 @@ AVInputFormat ff_mmf_demuxer = {
.flags = AVFMT_GENERIC_INDEX, .flags = AVFMT_GENERIC_INDEX,
}; };
#endif #endif
#if CONFIG_MMF_MUXER #if CONFIG_MMF_MUXER
AVOutputFormat ff_mmf_muxer = { AVOutputFormat ff_mmf_muxer = {
.name = "mmf", .name = "mmf",