diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-05 01:46:03 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-05 02:26:17 +0200 |
commit | 5d4fd1d1adf1ec17dd19548783f7f2eb0d64225f (patch) | |
tree | 0ed0d9be892e55bea47d777dcd78d7c1cf104adf /libavformat | |
parent | 96676e1abfece89e20bc962255b48cb2d9e417bd (diff) | |
parent | 3824ef08e0878aa9f100f33ef22b61daf68058c2 (diff) | |
download | ffmpeg-streaming-5d4fd1d1adf1ec17dd19548783f7f2eb0d64225f.zip ffmpeg-streaming-5d4fd1d1adf1ec17dd19548783f7f2eb0d64225f.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (36 commits)
ARM: allow unaligned buffer in fixed-point NEON FFT4
fate: test more FFT etc sizes
dca: set AVCodecContext frame_size for DTS audio
YASM: Shut up unused variable compiler warning with --disable-yasm.
x86_32: Fix build on x86_32 with --disable-yasm.
iirfilter: add fate test
doxygen: Add qmul docs.
ogg: propagate return values and return more meaningful error values
H.264: fix overreads of qscale_table
Remove unused static tables and static inline functions.
eval: clear Parser instances before using
dct-test: remove 'ref' function pointer from tables
build: Remove deleted 'check' target from .PHONY list.
oggdec: Abort Ogg header parsing when encountering a data packet.
Add LGPL license boilerplate to files lacking it.
mxfenc: small typo fix
doxygen: Fix documentation for some VP8 functions.
sha: use AV_RB32() instead of assuming buffer can be cast to uint32_t*
des: allow unaligned input and output buffers
aes: allow unaligned input and output buffers
...
Conflicts:
libavcodec/dct-test.c
libavcodec/libvpxenc.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/h264_qpel_mmx.c
libavfilter/x86/gradfun.c
libavformat/oggdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/mxfenc.c | 2 | ||||
-rw-r--r-- | libavformat/oggdec.c | 19 |
2 files changed, 10 insertions, 11 deletions
diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index c6532a3..9b5b4b7 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -1549,7 +1549,7 @@ static uint32_t ff_framenum_to_12m_time_code(unsigned frame, int drop, int fps) ((((frame / (fps * 60)) % 60) / 10) << 12) | // tens of minutes ((((frame / (fps * 60)) % 60) % 10) << 8) | // units of minutes (0 << 7) | // b1 - (0 << 6) | // b2 (NSC), field phase (PAL) + (0 << 6) | // b2 (NTSC), field phase (PAL) ((((frame / (fps * 3600) % 24)) / 10) << 4) | // tens of hours ( (frame / (fps * 3600) % 24)) % 10; // units of hours } diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index 9722d62..597ea3b 100644 --- a/libavformat/oggdec.c +++ b/libavformat/oggdec.c @@ -201,7 +201,7 @@ static int ogg_read_page(AVFormatContext *s, int *str) uint8_t sync[4]; int sp = 0; - ret = avio_read (bc, sync, 4); + ret = avio_read(bc, sync, 4); if (ret < 4) return ret < 0 ? ret : AVERROR_EOF; @@ -259,7 +259,7 @@ static int ogg_read_page(AVFormatContext *s, int *str) if(os->psize > 0) ogg_new_buf(ogg, idx); - ret = avio_read (bc, os->segments, nsegs); + ret = avio_read(bc, os->segments, nsegs); if (ret < nsegs) return ret < 0 ? ret : AVERROR_EOF; @@ -292,7 +292,7 @@ static int ogg_read_page(AVFormatContext *s, int *str) os->buf = nb; } - ret = avio_read (bc, os->buf + os->bufpos, size); + ret = avio_read(bc, os->buf + os->bufpos, size); if (ret < size) return ret < 0 ? ret : AVERROR_EOF; @@ -321,7 +321,7 @@ static int ogg_packet(AVFormatContext *s, int *str, int *dstart, int *dsize, idx = ogg->curidx; while (idx < 0){ - ret = ogg_read_page (s, &idx); + ret = ogg_read_page(s, &idx); if (ret < 0) return ret; } @@ -437,7 +437,7 @@ static int ogg_get_headers(AVFormatContext *s) int ret; do{ - ret = ogg_packet (s, NULL, NULL, NULL, NULL); + ret = ogg_packet(s, NULL, NULL, NULL, NULL); if (ret < 0) return ret; }while (!ogg->headers); @@ -501,10 +501,9 @@ static int ogg_read_header(AVFormatContext *s, AVFormatParameters *ap) int ret, i; ogg->curidx = -1; //linear headers seek from start - ret = ogg_get_headers (s); - if (ret < 0){ + ret = ogg_get_headers(s); + if (ret < 0) return ret; - } for (i = 0; i < ogg->nstreams; i++) if (ogg->streams[i].header < 0) @@ -558,7 +557,7 @@ static int ogg_read_packet(AVFormatContext *s, AVPacket *pkt) //Get an ogg packet retry: do{ - ret = ogg_packet (s, &idx, &pstart, &psize, &fpos); + ret = ogg_packet(s, &idx, &pstart, &psize, &fpos); if (ret < 0) return ret; }while (idx < 0 || !s->streams[idx]); @@ -574,7 +573,7 @@ retry: os->keyframe_seek = 0; //Alloc a pkt - ret = av_new_packet (pkt, psize); + ret = av_new_packet(pkt, psize); if (ret < 0) return ret; pkt->stream_index = idx; |