diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-02-07 01:40:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-02-07 01:40:29 +0100 |
| commit | b479e016128efe42e8b26ceb6c1b4a95b6d0c791 (patch) | |
| tree | 30ab5e543d733f62a81deecce3a15404e46ce4f4 /libavcodec/arm | |
| parent | 6ba2505a0e894eeb326cfee95df9e1c030bcde3e (diff) | |
| parent | d016d3074cc084ea813e389f046eee01ecd48b7e (diff) | |
| download | ffmpeg-b479e016128efe42e8b26ceb6c1b4a95b6d0c791.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Revert "v210enc: use FFALIGN()"
doxygen: Do not include license boilerplates in Doxygen comment blocks.
avplay: reset decoder flush state when seeking
ape: skip packets with invalid size
ape: calculate final packet size instead of guessing
ape: stop reading after the last frame has been read
ape: return AVERROR_EOF instead of AVERROR(EIO) when demuxing is finished
ape: return error if seeking to the current packet fails in ape_read_packet()
avcodec: Clarify AVFrame member documentation.
v210dec: check for coded_frame allocation failure
v210enc: use stride as it is already calculated
v210enc: use FFALIGN()
v210enc: return proper AVERROR codes instead of -1
v210enc: do not set coded_frame->key_frame
v210enc: check for coded_frame allocation failure
drawtext: add 'fix_bounds' option on coords fixing
drawtext: fix text_{w, h} expression vars
drawtext: add missing braces around an if() block.
Conflicts:
libavcodec/arm/vp8.h
libavcodec/arm/vp8dsp_init_arm.c
libavcodec/v210dec.c
libavfilter/vf_drawtext.c
libavformat/ape.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm')
| -rw-r--r-- | libavcodec/arm/vp8.h | 2 | ||||
| -rw-r--r-- | libavcodec/arm/vp8_armv6.S | 2 | ||||
| -rw-r--r-- | libavcodec/arm/vp8dsp_init_arm.c | 2 | ||||
| -rw-r--r-- | libavcodec/arm/vp8dsp_neon.S | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/arm/vp8.h b/libavcodec/arm/vp8.h index 55193394c5..d3fce4cafe 100644 --- a/libavcodec/arm/vp8.h +++ b/libavcodec/arm/vp8.h @@ -1,4 +1,4 @@ -/** +/* * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or diff --git a/libavcodec/arm/vp8_armv6.S b/libavcodec/arm/vp8_armv6.S index 8a3beb9fbb..9399bb28d7 100644 --- a/libavcodec/arm/vp8_armv6.S +++ b/libavcodec/arm/vp8_armv6.S @@ -1,4 +1,4 @@ -/** +/* * Copyright (C) 2010 Mans Rullgard * * This file is part of FFmpeg. diff --git a/libavcodec/arm/vp8dsp_init_arm.c b/libavcodec/arm/vp8dsp_init_arm.c index b56e6f42e0..14021c954d 100644 --- a/libavcodec/arm/vp8dsp_init_arm.c +++ b/libavcodec/arm/vp8dsp_init_arm.c @@ -1,4 +1,4 @@ -/** +/* * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or diff --git a/libavcodec/arm/vp8dsp_neon.S b/libavcodec/arm/vp8dsp_neon.S index b4ab1c7032..a9f698dfed 100644 --- a/libavcodec/arm/vp8dsp_neon.S +++ b/libavcodec/arm/vp8dsp_neon.S @@ -1,4 +1,4 @@ -/** +/* * VP8 NEON optimisations * * Copyright (c) 2010 Rob Clark <rob@ti.com> |